Store status data inside Flag activity

2 files changed, 21 insertions, 30 deletions

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 57982eb4a..c58ee7482 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -12,6 +12,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   alias Pleroma.User
   alias Pleroma.Web
   alias Pleroma.Web.ActivityPub.Visibility
+  alias Pleroma.Web.AdminAPI.AccountView
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Router.Helpers
 
@@ -608,34 +609,24 @@ defmodule Pleroma.Web.ActivityPub.Utils do
 
   defp build_flag_object(%{account: account, statuses: statuses} = _) do
     [account.ap_id] ++
-      Enum.map(statuses || [], fn
-        %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"]
-          }
+      Enum.map(statuses || [], fn act ->
+        id =
+          case act do
+            %Activity{} = act -> act.data["id"]
+            act when is_map(act) -> act["id"]
+            act when is_binary(act) -> act
+          end
+
+        activity = Activity.get_by_ap_id_with_object(id)
+        actor = User.get_by_ap_id(activity.object.data["actor"])
+
+        %{
+          "type" => "Note",
+          "id" => activity.data["id"],
+          "content" => activity.object.data["content"],
+          "published" => activity.object.data["published"],
+          "actor" => AccountView.render("show.json", %{user: actor})
+        }
       end)
   end
 
diff --git a/lib/pleroma/web/admin_api/report.ex b/lib/pleroma/web/admin_api/report.ex
index c751dc2be..ccd56e15e 100644
--- a/lib/pleroma/web/admin_api/report.ex
+++ b/lib/pleroma/web/admin_api/report.ex
@@ -13,8 +13,8 @@ defmodule Pleroma.Web.AdminAPI.Report do
     account = User.get_cached_by_ap_id(account_ap_id)
 
     statuses =
-      Enum.map(status_ap_ids, fn ap_id ->
-        Activity.get_by_ap_id_with_object(ap_id)
+      Enum.map(status_ap_ids, fn act ->
+        Activity.get_by_ap_id_with_object(act["id"])
       end)
 
     %{report: report, user: user, account: account, statuses: statuses}