Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'

Give admin the choice to not strip reported statuses

Closes #2887

See merge request pleroma/pleroma!3773

2 files changed, 46 insertions, 14 deletions

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index d3b7d804f..57a2f53c4 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -748,22 +748,21 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     ActivityPub.fetch_activities([], params, :offset)
   end
 
-  def update_report_state(%Activity{} = activity, state)
-      when state in @strip_status_report_states do
-    {:ok, stripped_activity} = strip_report_status_data(activity)
+  defp maybe_strip_report_status(data, state) do
+    with true <- Config.get([:instance, :report_strip_status]),
+         true <- state in @strip_status_report_states,
+         {:ok, stripped_activity} = strip_report_status_data(%Activity{data: data}) do
+      data |> Map.put("object", stripped_activity.data["object"])
+    else
+      _ -> data
+    end
+  end
 
+  def update_report_state(%Activity{} = activity, state) when state in @supported_report_states do
     new_data =
       activity.data
       |> Map.put("state", state)
-      |> Map.put("object", stripped_activity.data["object"])
-
-    activity
-    |> Changeset.change(data: new_data)
-    |> Repo.update()
-  end
-
-  def update_report_state(%Activity{} = activity, state) when state in @supported_report_states do
-    new_data = Map.put(activity.data, "state", state)
+      |> maybe_strip_report_status(state)
 
     activity
     |> Changeset.change(data: new_data)
diff --git a/lib/pleroma/web/admin_api/report.ex b/lib/pleroma/web/admin_api/report.ex
index 8d1abfa56..6856bfcb3 100644
--- a/lib/pleroma/web/admin_api/report.ex
+++ b/lib/pleroma/web/admin_api/report.ex
@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.AdminAPI.Report do
   alias Pleroma.Activity
+  alias Pleroma.Object
   alias Pleroma.User
 
   def extract_report_info(
@@ -16,10 +17,42 @@ defmodule Pleroma.Web.AdminAPI.Report do
       status_ap_ids
       |> Enum.reject(&is_nil(&1))
       |> Enum.map(fn
-        act when is_map(act) -> Activity.get_by_ap_id_with_object(act["id"])
-        act when is_binary(act) -> Activity.get_by_ap_id_with_object(act)
+        act when is_map(act) ->
+          Activity.get_by_ap_id_with_object(act["id"]) || make_fake_activity(act, user)
+
+        act when is_binary(act) ->
+          Activity.get_by_ap_id_with_object(act)
       end)
 
     %{report: report, user: user, account: account, statuses: statuses}
   end
+
+  defp make_fake_activity(act, user) do
+    %Activity{
+      id: "pleroma:fake",
+      data: %{
+        "actor" => user.ap_id,
+        "type" => "Create",
+        "to" => [],
+        "cc" => [],
+        "object" => act["id"],
+        "published" => act["published"],
+        "id" => act["id"],
+        "context" => "pleroma:fake"
+      },
+      recipients: [user.ap_id],
+      object: %Object{
+        data: %{
+          "actor" => user.ap_id,
+          "type" => "Note",
+          "content" => act["content"],
+          "published" => act["published"],
+          "to" => [],
+          "cc" => [],
+          "id" => act["id"],
+          "context" => "pleroma:fake"
+        }
+      }
+    }
+  end
 end