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

Handle reverse serialized fields with no serialized field

Browse source
This commit is contained in:
Mouse Reeve 2020-12-23 13:33:46 -08:00
parent a3df0847e1
commit 365408e86b
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bookwyrm/activitypub/base_activity.py
View file

@ -114,7 +114,7 @@ class ActivityObject:
# creating a Work, model_field is 'editions' # creating a Work, model_field is 'editions'
# creating a User, model field is 'key_pair' # creating a User, model field is 'key_pair'
related_model = model_field.field.model related_model = model_field.field.model
related_field_name = model_field.field.activitypub_field related_field_name = model_field.field.name
for item in values: for item in values:
set_related_field.delay( set_related_field.delay(
@ -137,8 +137,8 @@ class ActivityObject:
@app.task @app.task
@transaction.atomic @transaction.atomic
def set_related_field( def set_related_field(
model_name, origin_model_name, model_name, origin_model_name, related_field_name,
related_field_name, related_remote_id, data): related_remote_id, data):
''' load reverse related fields (editions, attachments) without blocking ''' ''' load reverse related fields (editions, attachments) without blocking '''
model = apps.get_model('bookwyrm.%s' % model_name, require_ready=True) model = apps.get_model('bookwyrm.%s' % model_name, require_ready=True)
origin_model = apps.get_model( origin_model = apps.get_model(
@ -164,8 +164,19 @@ def set_related_field(
# set the origin's remote id on the activity so it will be there when # set the origin's remote id on the activity so it will be there when
# the model instance is created # the model instance is created
# edition.parentWork = instance, for example # edition.parentWork = instance, for example
setattr(activity, related_field_name, instance.remote_id) model_field = getattr(model, related_field_name)
activity.to_model(model) if hasattr(model_field, 'activitypub_field'):
setattr(
activity,
getattr(model_field, 'activitypub_field'),
instance.remote_id
)
item = activity.to_model(model)
# if the related field isn't serialized (attachments on Status), then
# we have to set it post-creation
if not hasattr(model_field, 'activitypub_field'):
setattr(item, related_field_name, instance)
def resolve_remote_id(model, remote_id, refresh=False, save=True): def resolve_remote_id(model, remote_id, refresh=False, save=True):