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

Don't error out user page

This commit is contained in:
Mouse Reeve 2021-01-11 14:05:08 -08:00
parent 5b7f7aa0e3
commit a6eb444a68
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bookwyrm/models/base_model.py
View File

@ -52,10 +52,11 @@ def execute_after_save(sender, instance, created, *args, **kwargs):
instance.save() instance.save()
def unfurl_related_field(related_field): def unfurl_related_field(related_field, sort_field=None):
''' load reverse lookups (like public key owner or Status attachment ''' ''' load reverse lookups (like public key owner or Status attachment '''
if hasattr(related_field, 'all'): if hasattr(related_field, 'all'):
return [unfurl_related_field(i) for i in related_field.all()] return [unfurl_related_field(i) for i in related_field.order_by(
sort_field).all()]
if related_field.reverse_unfurl: if related_field.reverse_unfurl:
return related_field.field_to_activity() return related_field.field_to_activity()
return related_field.remote_id return related_field.remote_id
@ -147,11 +148,9 @@ class ActivitypubMixin:
# for example, editions of a work # for example, editions of a work
for model_field_name, activity_field_name, sort_field in \ for model_field_name, activity_field_name, sort_field in \
self.serialize_reverse_fields: self.serialize_reverse_fields:
related_field = getattr( related_field = getattr(self, model_field_name)
self, model_field_name
).order_by(sort_field)
activity[activity_field_name] = \ activity[activity_field_name] = \
unfurl_related_field(related_field) unfurl_related_field(related_field, sort_field)
if not activity.get('id'): if not activity.get('id'):
activity['id'] = self.get_remote_id() activity['id'] = self.get_remote_id()