rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Fixes image fields breaking user import

Browse source
This commit is contained in:
Mouse Reeve 2020-12-12 15:44:17 -08:00
parent 37aaaa97b2
commit e58ef83f20
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/activitypub/base_activity.py
View file

@ -81,6 +81,7 @@ class ActivityObject:
instance = model.find_existing(self.serialize()) or model() instance = model.find_existing(self.serialize()) or model()
many_to_many_fields = {} many_to_many_fields = {}
image_fields = {}
for field in model._meta.get_fields(): for field in model._meta.get_fields():
# check if it's an activitypub field # check if it's an activitypub field
if not hasattr(field, 'field_to_activity'): if not hasattr(field, 'field_to_activity'):
@ -99,11 +100,15 @@ class ActivityObject:
many_to_many_fields[field.name] = value many_to_many_fields[field.name] = value
elif isinstance(model_field, ImageFileDescriptor): elif isinstance(model_field, ImageFileDescriptor):
# image fields need custom handling # image fields need custom handling
getattr(instance, field.name).save(*value, save=save) image_fields[field.name] = value
else: else:
# just a good old fashioned model.field = value # just a good old fashioned model.field = value
setattr(instance, field.name, value) setattr(instance, field.name, value)
# if this isn't here, it messes up saving users. who even knows.
for (model_key, value) in image_fields.items():
getattr(instance, model_key).save(*value, save=save)
if not save: if not save:
# we can't set many to many and reverse fields on an unsaved object # we can't set many to many and reverse fields on an unsaved object
return instance return instance