heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1021 - Skip broken activities which caused feed/inbox to 500

Browse Source
This commit is contained in:
Jessica Tallon 2014-11-20 09:46:37 +00:00
parent 45e687fcf8
commit dd73391663
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/federation/views.py
View File

@ -357,7 +357,14 @@ def feed_endpoint(request):
} }
for activity in Activity.query.filter_by(actor=request.user.id): for activity in Activity.query.filter_by(actor=request.user.id):
feed["items"].append(activity.serialize(request)) try:
feed["items"].append(activity.serialize(request))
except AttributeError:
# This occurs because of how we hard-deletion and the object
# no longer existing anymore. We want to keep the Activity
# in case someone wishes to look it up but we shouldn't display
# it in the feed.
pass
feed["totalItems"] = len(feed["items"]) feed["totalItems"] = len(feed["items"])
return json_response(feed) return json_response(feed)