Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pleroma-moderation-log-stuff' into 'develop'

Browse Source 
AdminAPI: return id for moderation log entries

See merge request pleroma/pleroma!3232
This commit is contained in:
lain 2021-01-05 11:36:57 +00:00
commit ca7cf62d2a
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/API/admin_api.md
View File

@ -1123,6 +1123,7 @@ Loads json generated from `config/descriptions.exs`.
```json ```json
[ [
{ {
"id": 1234,
"data": { "data": {
"actor": { "actor": {
"id": 1, "id": 1,

1
lib/pleroma/web/admin_api/views/moderation_log_view.ex
View File

@ -21,6 +21,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogView do
|> DateTime.to_unix() |> DateTime.to_unix()
%{ %{
id: log_entry.id,
data: log_entry.data, data: log_entry.data,
time: time, time: time,
message: ModerationLog.get_log_entry_message(log_entry) message: ModerationLog.get_log_entry_message(log_entry)

5
test/pleroma/web/admin_api/views/moderation_log_view_test.exs
View File

@ -9,6 +9,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
describe "renders `report_note_delete` log messages" do describe "renders `report_note_delete` log messages" do
setup do setup do
log1 = %Pleroma.ModerationLog{ log1 = %Pleroma.ModerationLog{
id: 1,
data: %{ data: %{
"action" => "report_note_delete", "action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"}, "actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@ -21,6 +22,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
} }
log2 = %Pleroma.ModerationLog{ log2 = %Pleroma.ModerationLog{
id: 2,
data: %{ data: %{
"action" => "report_note_delete", "action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"}, "actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@ -42,6 +44,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
) == %{ ) == %{
items: [ items: [
%{ %{
id: 1,
data: %{ data: %{
"action" => "report_note_delete", "action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"}, "actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@ -59,6 +62,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
time: 1_605_622_400 time: 1_605_622_400
}, },
%{ %{
id: 2,
data: %{ data: %{
"action" => "report_note_delete", "action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"}, "actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@ -82,6 +86,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
test "renders `report_note_delete` log message", %{log1: log} do test "renders `report_note_delete` log message", %{log1: log} do
assert ModerationLogView.render("show.json", %{log_entry: log}) == %{ assert ModerationLogView.render("show.json", %{log_entry: log}) == %{
id: 1,
data: %{ data: %{
"action" => "report_note_delete", "action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"}, "actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},