rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests 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 28dc67bf5c
commit d8c83fa31c
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_HOST_PASSWORD: ""
EMAIL_USE_TLS: true EMAIL_USE_TLS: true
run: | run: |
python manage.py test -v 3 python manage.py test

4
bookwyrm/activitypub/base_activity.py
View file

@ -255,7 +255,7 @@ def resolve_remote_id(
if model: # a bonus check we can do if we already know the model if model: # a bonus check we can do if we already know the model
result = model.find_existing_by_remote_id(remote_id) result = model.find_existing_by_remote_id(remote_id)
if result and not refresh: 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 # load the data and create the object
try: try:
@ -271,7 +271,7 @@ def resolve_remote_id(
# check for existing items with shared unique identifiers # check for existing items with shared unique identifiers
result = model.find_existing(data) result = model.find_existing(data)
if result and not refresh: if result and not refresh:
return result return result if not get_activity else result.to_activity_dataclass()
item = model.activity_serializer(**data) item = model.activity_serializer(**data)
if get_activity: if get_activity: