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

Removes duplicate atomic block

Browse source
This commit is contained in:
Mouse Reeve 2022-01-12 16:41:23 -08:00
parent dedcbda2d8
commit 5fcdc284ce
1 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
bookwyrm/activitypub/base_activity.py
View file

@ -208,35 +208,34 @@ def set_related_field(
model = apps.get_model(f"bookwyrm.{model_name}", require_ready=True) model = apps.get_model(f"bookwyrm.{model_name}", require_ready=True)
origin_model = apps.get_model(f"bookwyrm.{origin_model_name}", require_ready=True) origin_model = apps.get_model(f"bookwyrm.{origin_model_name}", require_ready=True)
with transaction.atomic(): if isinstance(data, str):
if isinstance(data, str): existing = model.find_existing_by_remote_id(data)
existing = model.find_existing_by_remote_id(data) if existing:
if existing: data = existing.to_activity()
data = existing.to_activity() else:
else: data = get_data(data)
data = get_data(data) activity = model.activity_serializer(**data)
activity = model.activity_serializer(**data)
# this must exist because it's the object that triggered this function # this must exist because it's the object that triggered this function
instance = origin_model.find_existing_by_remote_id(related_remote_id) instance = origin_model.find_existing_by_remote_id(related_remote_id)
if not instance: if not instance:
raise ValueError(f"Invalid related remote id: {related_remote_id}") raise ValueError(f"Invalid related remote id: {related_remote_id}")
# 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
model_field = getattr(model, related_field_name) model_field = getattr(model, related_field_name)
if hasattr(model_field, "activitypub_field"): if hasattr(model_field, "activitypub_field"):
setattr( setattr(
activity, getattr(model_field, "activitypub_field"), instance.remote_id activity, getattr(model_field, "activitypub_field"), instance.remote_id
) )
item = activity.to_model() item = activity.to_model()
# if the related field isn't serialized (attachments on Status), then # if the related field isn't serialized (attachments on Status), then
# we have to set it post-creation # we have to set it post-creation
if not hasattr(model_field, "activitypub_field"): if not hasattr(model_field, "activitypub_field"):
setattr(item, related_field_name, instance) setattr(item, related_field_name, instance)
item.save() item.save()
def get_model_from_type(activity_type): def get_model_from_type(activity_type):