From ff42ae3f1f7d04d6762cda34eac64f09e5c8ff01 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 17 Mar 2024 02:02:32 +1300
Subject: [PATCH] still return HTTP 200 even if activity was not logged.
 Hopefully friendca will cope #103

---
 app/activitypub/routes.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py
index 309e1d3c..9df2ef01 100644
--- a/app/activitypub/routes.py
+++ b/app/activitypub/routes.py
@@ -1104,7 +1104,10 @@ def post_ap(post_id):
 def activities_json(type, id):
     activity = ActivityPubLog.query.filter_by(activity_id=f"https://{current_app.config['SERVER_NAME']}/activities/{type}/{id}").first()
     if activity:
-        activity_json = json.loads(activity.activity_json)
+        if activity.activity_json is not None:
+            activity_json = json.loads(activity.activity_json)
+        else:
+            activity_json = {}
         resp = jsonify(activity_json)
         resp.content_type = 'application/activity+json'
         return resp