aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/federation/views.py9
1 files changed, 8 insertions, 1 deletions
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)