pleroma

commit: 0ecd6ba35e868eac296b013f743d82a120dd68db
parent b354d70e85bbf0f685f3d56f7377fde2efce4187
Author: marcin mikołajczak <git@mkljczk.pl>
Date:   Mon, 30 May 2022 12:50:44 +0200

AdminAPI: Allow filtering reports by rule_id

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

Diffstat:
M
lib/pleroma/web/activity_pub/activity_pub.ex
10
++++++++++
M
lib/pleroma/web/api_spec/operations/admin/report_operation.ex
6
++++++
M
test/pleroma/web/admin_api/controllers/report_controller_test.exs
29
+++++++++++++++++++++++++++++
M
test/pleroma/web/admin_api/views/report_view_test.exs
8
+++++---
M
test/pleroma/web/mastodon_api/controllers/report_controller_test.exs
2
++

5 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1191,6 +1191,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_filtered(query, _), do: query
 
+  defp restrict_rule(query, %{rule_id: rule_id}) do
+    from(
+      activity in query,
+      where: fragment("(?)->'rules' \\? (?)", activity.data, ^rule_id)
+    )
+  end
+
+  defp restrict_rule(query, _), do: query
+
   defp exclude_poll_votes(query, %{include_poll_votes: true}), do: query
 
   defp exclude_poll_votes(query, _) do
@@ -1353,6 +1362,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       |> restrict_instance(opts)
       |> restrict_announce_object_actor(opts)
       |> restrict_filtered(opts)
+      |> restrict_rule(opts)
       |> Activity.restrict_deactivated_users()
       |> exclude_poll_votes(opts)
       |> exclude_chat_messages(opts)
diff --git a/lib/pleroma/web/api_spec/operations/admin/report_operation.ex b/lib/pleroma/web/api_spec/operations/admin/report_operation.ex
@@ -31,6 +31,12 @@ defmodule Pleroma.Web.ApiSpec.Admin.ReportOperation do
           "Filter by report state"
         ),
         Operation.parameter(
+          :rule_id,
+          :query,
+          %Schema{type: :string},
+          "Filter by selected rule id"
+        ),
+        Operation.parameter(
           :limit,
           :query,
           %Schema{type: :integer},
diff --git a/test/pleroma/web/admin_api/controllers/report_controller_test.exs b/test/pleroma/web/admin_api/controllers/report_controller_test.exs
@@ -11,6 +11,7 @@ defmodule Pleroma.Web.AdminAPI.ReportControllerTest do
   alias Pleroma.ModerationLog
   alias Pleroma.Repo
   alias Pleroma.ReportNote
+  alias Pleroma.Rule
   alias Pleroma.Web.CommonAPI
 
   setup do
@@ -313,6 +314,34 @@ defmodule Pleroma.Web.AdminAPI.ReportControllerTest do
                "error" => "Invalid credentials."
              }
     end
+
+    test "returns reports with specified role_id", %{conn: conn} do
+      [reporter, target_user] = insert_pair(:user)
+
+      %{id: rule_id} = Rule.create(%{text: "Example rule"})
+
+      rule_id = to_string(rule_id)
+
+      {:ok, %{id: report_id}} =
+        CommonAPI.report(reporter, %{
+          account_id: target_user.id,
+          comment: "",
+          rule_ids: [rule_id]
+        })
+
+      {:ok, _report} =
+        CommonAPI.report(reporter, %{
+          account_id: target_user.id,
+          comment: ""
+        })
+
+      response =
+        conn
+        |> get("/api/pleroma/admin/reports?rule_id=#{rule_id}")
+        |> json_response_and_validate_schema(:ok)
+
+      assert %{"reports" => [%{"id" => ^report_id}]} = response
+    end
   end
 
   describe "POST /api/pleroma/admin/reports/:id/notes" do
diff --git a/test/pleroma/web/admin_api/views/report_view_test.exs b/test/pleroma/web/admin_api/views/report_view_test.exs
@@ -176,15 +176,17 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do
     user = insert(:user)
     other_user = insert(:user)
 
-    %{id: id, text: text} = Rule.create(%{text: "Example rule"})
+    %{id: rule_id, text: text} = Rule.create(%{text: "Example rule"})
+
+    rule_id = to_string(rule_id)
 
     {:ok, activity} =
       CommonAPI.report(user, %{
         account_id: other_user.id,
-        rule_ids: [id]
+        rule_ids: [rule_id]
       })
 
-    assert %{rules: [%{id: ^id, text: ^text}]} =
+    assert %{rules: [%{id: ^rule_id, text: ^text}]} =
              ReportView.render("show.json", Report.extract_report_info(activity))
   end
 end
diff --git a/test/pleroma/web/mastodon_api/controllers/report_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/report_controller_test.exs
@@ -52,6 +52,8 @@ defmodule Pleroma.Web.MastodonAPI.ReportControllerTest do
   } do
     %{id: rule_id} = Rule.create(%{text: "There are no rules"})
 
+    rule_id = to_string(rule_id)
+
     assert %{"action_taken" => false, "id" => id} =
              conn
              |> put_req_header("content-type", "application/json")