zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Pass model instances into activities instead of json

Browse source
This commit is contained in:
Mouse Reeve 2021-02-17 10:30:02 -08:00
parent 9225043b5d
commit 92e40e1cec
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bookwyrm/activitypub/base_activity.py
View file

@ -74,14 +74,13 @@ class ActivityObject:
is_subclass = issubclass(field.type, ActivityObject)
except TypeError:
is_subclass = False
# serialize a model obj
if hasattr(value, 'to_activity'):
value = value.to_activity()
# parse a dict into the appropriate activity
if is_subclass and isinstance(value, dict):
serializer = None
if not isinstance(field.type, ActivityObject):
# this is generic, gotta figure out the type manually
serializer = field.type
elif is_subclass and isinstance(value, dict):
value = naive_parse(
activity_objects, value, serializer=serializer)
activity_objects, value, serializer=field.type)
except KeyError:
if field.default == MISSING and \