Merge branch 'tusooa/3059-report-fake-create-render' into 'develop'

Fix inproper content being cached in report content

Closes #3059

See merge request pleroma/pleroma!3836
This commit is contained in:
lain 2023-02-09 19:52:01 +00:00
commit 00b39dea5d
2 changed files with 29 additions and 1 deletions

View File

@ -31,7 +31,7 @@ defmodule Pleroma.Web.AdminAPI.Report do
defp make_fake_activity(act, user) do defp make_fake_activity(act, user) do
%Activity{ %Activity{
id: "pleroma:fake", id: "pleroma:fake:#{act["id"]}",
data: %{ data: %{
"actor" => user.ap_id, "actor" => user.ap_id,
"type" => "Create", "type" => "Create",

View File

@ -366,6 +366,34 @@ defmodule Pleroma.Web.AdminAPI.ReportControllerTest do
|> json_response_and_validate_schema(:ok) |> json_response_and_validate_schema(:ok)
end end
test "renders content correctly", %{conn: conn} do
[reporter, target_user] = insert_pair(:user)
note = insert(:note, user: target_user, data: %{"content" => "mew 1"})
note2 = insert(:note, user: target_user, data: %{"content" => "mew 2"})
activity = insert(:note_activity, user: target_user, note: note)
activity2 = insert(:note_activity, user: target_user, note: note2)
{:ok, _report} =
CommonAPI.report(reporter, %{
account_id: target_user.id,
comment: "I feel offended",
status_ids: [activity.id, activity2.id]
})
CommonAPI.delete(activity.id, target_user)
CommonAPI.delete(activity2.id, target_user)
response =
conn
|> get(report_path(conn, :index))
|> json_response_and_validate_schema(:ok)
assert [open_report] = response["reports"]
assert %{"statuses" => [s1, s2]} = open_report
assert "mew 1" in [s1["content"], s2["content"]]
assert "mew 2" in [s1["content"], s2["content"]]
end
test "returns 403 when requested by a non-admin" do test "returns 403 when requested by a non-admin" do
user = insert(:user) user = insert(:user)
token = insert(:oauth_token, user: user) token = insert(:oauth_token, user: user)