From: Jessica Tallon <jessica@megworld.co.uk>
Date: Thu, 20 Nov 2014 09:46:37 +0000 (+0000)
Subject: Fix #1021 - Skip broken activities which caused feed/inbox to 500
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd733916633b5bc2588cbe621087551144e70a63;p=mediagoblin.git

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

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)