Merge branch 'develop' into fix/reject-third-party-reports

changelog.d/iceshrimpnet-reports-fix.fix

@@ -0,0 +1 @@
+Handle reports with just actor ap id as the object

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -450,6 +450,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
        ) do
     with context <- data["context"] || Utils.generate_context_id(),
          content <- data["content"] || "",
+         objects <- List.wrap(objects),
          %User{} = actor <- User.get_cached_by_ap_id(actor),
          # Reduce the object list to find the reported user.
          %User{} = account <- get_reported(objects),

test/pleroma/web/activity_pub/transmogrifier_test.exs

@@ -103,6 +103,26 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
       refute "Flag" |> Pleroma.Activity.Queries.by_type() |> Pleroma.Repo.one()
     end
 
+    test "it accepts Flag activities with just actor id as object" do
+      user = insert(:user)
+      other_user = insert(:user)
+
+      message = %{
+        "@context" => "https://www.w3.org/ns/activitystreams",
+        "cc" => [user.ap_id],
+        "object" => user.ap_id,
+        "type" => "Flag",
+        "content" => "blocked AND reported!!!",
+        "actor" => other_user.ap_id
+      }
+
+      assert {:ok, activity} = Transmogrifier.handle_incoming(message)
+
+      assert activity.data["content"] == "blocked AND reported!!!"
+      assert activity.data["actor"] == other_user.ap_id
+      assert activity.data["cc"] == [user.ap_id]
+    end
+
     test "it accepts Move activities" do
       old_user = insert(:user)
       new_user = insert(:user)