From dd733916633b5bc2588cbe621087551144e70a63 Mon Sep 17 00:00:00 2001 From: Jessica Tallon Date: Thu, 20 Nov 2014 09:46:37 +0000 Subject: [PATCH] Fix #1021 - Skip broken activities which caused feed/inbox to 500 --- mediagoblin/federation/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py index 4dad82d6..715cb8cd 100644 --- a/mediagoblin/federation/views.py +++ b/mediagoblin/federation/views.py @@ -357,7 +357,14 @@ def feed_endpoint(request): } 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"]) return json_response(feed) -- 2.25.1