mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-04 15:26:48 +00:00
Code Issues Projects Releases Wiki Activity

Return activities for existing objs in resolve_remote_id

Browse source
This commit is contained in:
Mouse Reeve 2021-03-24 12:58:39 -07:00
parent 9dbd1c674c
commit 4b44ce691e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/django-tests.yml vendored
View file

@ -65,4 +65,4 @@ jobs:
EMAIL_HOST_PASSWORD: ""
EMAIL_USE_TLS: true
run: |
python manage.py test -v 3
python manage.py test

4
bookwyrm/activitypub/base_activity.py
View file

@ -253,7 +253,7 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
if model: # a bonus check we can do if we already know the model
result = model.find_existing_by_remote_id(remote_id)
if result and not refresh:
return result
return result if not get_activity else result.to_activity_dataclass()
# load the data and create the object
try:
@ -269,7 +269,7 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
# check for existing items with shared unique identifiers
result = model.find_existing(data)
if result and not refresh:
return result
return result if not get_activity else result.to_activity_dataclass()
item = model.activity_serializer(**data)
# if we're refreshing, "result" will be set and we'll update it