yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #756 from mouse-reeve/user-error 

Fixes failed serialization of empty avatar field
This commit is contained in:
Mouse Reeve 2021-03-17 14:47:16 -07:00 committed by GitHub
parent d50689e63f ba09377041
commit 284366e46f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/activitypub/base_activity.py
View File

@ -75,7 +75,7 @@ class ActivityObject:
for field in fields(self): for field in fields(self):
try: try:
value = kwargs[field.name] value = kwargs[field.name]
if value in (None, MISSING): if value in (None, MISSING, {}):
raise KeyError() raise KeyError()
try: try:
is_subclass = issubclass(field.type, ActivityObject) is_subclass = issubclass(field.type, ActivityObject)

2
bookwyrm/activitypub/person.py
View File

@ -24,7 +24,7 @@ class Person(ActivityObject):
outbox: str outbox: str
followers: str followers: str
publicKey: PublicKey publicKey: PublicKey
endpoints: Dict endpoints: Dict = None
name: str = None name: str = None
summary: str = None summary: str = None
icon: Image = field(default_factory=lambda: {}) icon: Image = field(default_factory=lambda: {})

4
bookwyrm/models/fields.py
View File

@ -73,7 +73,7 @@ class ActivitypubFieldMixin:
raise raise
value = getattr(data, "actor") value = getattr(data, "actor")
formatted = self.field_from_activity(value) formatted = self.field_from_activity(value)
if formatted is None or formatted is MISSING: if formatted is None or formatted is MISSING or formatted == {}:
return return
setattr(instance, self.name, formatted) setattr(instance, self.name, formatted)
@ -101,7 +101,7 @@ class ActivitypubFieldMixin:
def field_from_activity(self, value): def field_from_activity(self, value):
""" formatter to convert activitypub into a model value """ """ formatter to convert activitypub into a model value """
if hasattr(self, "activitypub_wrapper"): if value and hasattr(self, "activitypub_wrapper"):
value = value.get(self.activitypub_wrapper) value = value.get(self.activitypub_wrapper)
return value return value