From 5a3b81d92ef532769a11d4374424665f6d97a08f Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 Nov 2023 17:55:16 +0400
Subject: ActivityPub.UtilsTest: Add failing test for strip_report_status_data

---
 test/pleroma/web/activity_pub/utils_test.exs | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/utils_test.exs b/test/pleroma/web/activity_pub/utils_test.exs
index 3f93c872b..05bff1e1c 100644
--- a/test/pleroma/web/activity_pub/utils_test.exs
+++ b/test/pleroma/web/activity_pub/utils_test.exs
@@ -16,6 +16,37 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do
 
   require Pleroma.Constants
 
+  describe "strip_report_status_data/1" do
+    test "does not break on issues with the reported activites" do
+      reporter = insert(:user)
+      target_account = insert(:user)
+      {:ok, activity} = CommonAPI.post(target_account, %{status: "foobar"})
+      context = Utils.generate_context_id()
+      content = "foobar"
+
+      res =
+        Utils.make_flag_data(
+          %{
+            actor: reporter,
+            context: context,
+            account: target_account,
+            statuses: [%{"id" => activity.data["id"]}],
+            content: content
+          },
+          %{}
+        )
+
+      res =
+        res
+        |> Map.put("object", res["object"] ++ [nil, 1, 5, "123"])
+
+      {:ok, activity} = Pleroma.Web.ActivityPub.ActivityPub.insert(res)
+
+      Utils.strip_report_status_data(activity)
+      |> IO.inspect()
+    end
+  end
+
   describe "fetch the latest Follow" do
     test "fetches the latest Follow activity" do
       %Activity{data: %{"type" => "Follow"}} = activity = insert(:follow_activity)
-- 
cgit v1.2.3


From 4ef56c5b65a4d1e7e90a87f1a1a507df523a4b4b Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Mon, 27 Nov 2023 18:44:11 +0400
Subject: ActivityPub.Utils: Only treat object ids as valid while stripping

---
 test/pleroma/web/activity_pub/utils_test.exs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/pleroma/web/activity_pub/utils_test.exs b/test/pleroma/web/activity_pub/utils_test.exs
index 05bff1e1c..9ca21f5d9 100644
--- a/test/pleroma/web/activity_pub/utils_test.exs
+++ b/test/pleroma/web/activity_pub/utils_test.exs
@@ -23,6 +23,7 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do
       {:ok, activity} = CommonAPI.post(target_account, %{status: "foobar"})
       context = Utils.generate_context_id()
       content = "foobar"
+      post_id = activity.data["id"]
 
       res =
         Utils.make_flag_data(
@@ -30,7 +31,7 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do
             actor: reporter,
             context: context,
             account: target_account,
-            statuses: [%{"id" => activity.data["id"]}],
+            statuses: [%{"id" => post_id}],
             content: content
           },
           %{}
@@ -42,8 +43,11 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do
 
       {:ok, activity} = Pleroma.Web.ActivityPub.ActivityPub.insert(res)
 
-      Utils.strip_report_status_data(activity)
-      |> IO.inspect()
+      [user_id, object | _] = activity.data["object"]
+
+      {:ok, stripped} = Utils.strip_report_status_data(activity)
+
+      assert stripped.data["object"] == [user_id, object["id"]]
     end
   end
 
-- 
cgit v1.2.3