Merge branch 'fix/reports-ordering' into 'develop'
Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225
This commit is contained in:
commit
afe9c152ab
@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
- **Breaking:** Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
|
||||
- Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
|
||||
- Emoji: Support the full Unicode 13.1 set of Emoji for reactions, plus regional indicators.
|
||||
- Admin API: Reports now ordered by newest
|
||||
|
||||
### Added
|
||||
|
||||
|
@ -19,8 +19,7 @@ defmodule Pleroma.Web.AdminAPI.ReportView do
|
||||
reports:
|
||||
reports[:items]
|
||||
|> Enum.map(&Report.extract_report_info/1)
|
||||
|> Enum.map(&render(__MODULE__, "show.json", &1))
|
||||
|> Enum.reverse(),
|
||||
|> Enum.map(&render(__MODULE__, "show.json", &1)),
|
||||
total: reports[:total]
|
||||
}
|
||||
end
|
||||
|
@ -143,4 +143,29 @@ defmodule Pleroma.Web.AdminAPI.ReportViewTest do
|
||||
|
||||
assert %{} = ReportView.render("show.json", Report.extract_report_info(activity))
|
||||
end
|
||||
|
||||
test "reports are ordered newest first" do
|
||||
user = insert(:user)
|
||||
other_user = insert(:user)
|
||||
|
||||
{:ok, report1} =
|
||||
CommonAPI.report(user, %{
|
||||
account_id: other_user.id,
|
||||
comment: "first report"
|
||||
})
|
||||
|
||||
{:ok, report2} =
|
||||
CommonAPI.report(user, %{
|
||||
account_id: other_user.id,
|
||||
comment: "second report"
|
||||
})
|
||||
|
||||
%{reports: rendered} =
|
||||
ReportView.render("index.json",
|
||||
reports: Pleroma.Web.ActivityPub.Utils.get_reports(%{}, 1, 50)
|
||||
)
|
||||
|
||||
assert report2.id == rendered |> Enum.at(0) |> Map.get(:id)
|
||||
assert report1.id == rendered |> Enum.at(1) |> Map.get(:id)
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user