From 90d516d42bd3d29e71e364535dd4208f8a54992a Mon Sep 17 00:00:00 2001
From: Maxim Filippov <colixer@gmail.com>
Date: Tue, 15 Oct 2019 16:52:41 +0200
Subject: [PATCH] Store status data inside flag activity

---
 lib/pleroma/web/activity_pub/utils.ex | 30 ++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 4ef479f96..57982eb4a 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -609,9 +609,33 @@ def make_flag_data(_, _), do: %{}
   defp build_flag_object(%{account: account, statuses: statuses} = _) do
     [account.ap_id] ++
       Enum.map(statuses || [], fn
-        %Activity{} = act -> act.data["id"]
-        act when is_map(act) -> act["id"]
-        act when is_binary(act) -> act
+        %Activity{} = act ->
+          obj = Object.get_by_ap_id(act.data["object"])
+
+          %{
+            "type" => "Note",
+            "id" => act.data["id"],
+            "content" => obj.data["content"]
+          }
+
+        act when is_map(act) ->
+          obj = Object.get_by_ap_id(act["object"])
+
+          %{
+            "type" => "Note",
+            "id" => act["id"],
+            "content" => obj.data["content"]
+          }
+
+        act
+        when is_binary(act) ->
+          activity = Activity.get_by_ap_id_with_object(act)
+
+          %{
+            "type" => "Note",
+            "id" => activity.data["id"],
+            "content" => activity.data["object"]["content"]
+          }
       end)
   end