From 2b341627da5d592bdedc66a331409f5228ab28cf Mon Sep 17 00:00:00 2001
From: Maxim Filippov <colixer@gmail.com>
Date: Mon, 25 Nov 2019 00:04:29 +0900
Subject: Admin API: Render whole status in grouped reports

---
 lib/pleroma/web/activity_pub/utils.ex          | 23 ++++++++++++++++++-----
 lib/pleroma/web/admin_api/views/report_view.ex |  8 +++++++-
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index c45662359..277ca3c7c 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -822,20 +822,33 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     reports = get_reports_by_status_id(activity["id"])
     max_date = Enum.max_by(reports, &NaiveDateTime.from_iso8601!(&1.data["published"]))
     actors = Enum.map(reports, & &1.user_actor)
+    {deleted, status} = get_status_data(activity)
 
     %{
       date: max_date.data["published"],
       account: activity["actor"],
-      status: %{
-        id: activity["id"],
-        content: activity["content"],
-        published: activity["published"]
-      },
+      status: status,
+      status_deleted: deleted,
       actors: Enum.uniq(actors),
       reports: reports
     }
   end
 
+  defp get_status_data(activity) do
+    case Activity.get_by_ap_id(activity["id"]) do
+      %Activity{} = act ->
+        {false, act}
+
+      _ ->
+        {true,
+         %{
+           id: activity["id"],
+           content: activity["content"],
+           published: activity["published"]
+         }}
+    end
+  end
+
   def get_reports_by_status_id(ap_id) do
     from(a in Activity,
       where: fragment("(?)->>'type' = 'Flag'", a.data),
diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex
index ca88595c7..0ba94def9 100644
--- a/lib/pleroma/web/admin_api/views/report_view.ex
+++ b/lib/pleroma/web/admin_api/views/report_view.ex
@@ -45,10 +45,16 @@ defmodule Pleroma.Web.AdminAPI.ReportView do
   def render("index_grouped.json", %{groups: groups}) do
     reports =
       Enum.map(groups, fn group ->
+        status =
+          if group[:status_deleted],
+            do: group[:status],
+            else: StatusView.render("show.json", %{activity: group[:status]})
+
         %{
           date: group[:date],
           account: group[:account],
-          status: group[:status],
+          status: status,
+          status_deleted: status_deleted,
           actors: Enum.map(group[:actors], &merge_account_views/1),
           reports:
             group[:reports]
-- 
cgit v1.2.3