Browse Source

AdminAPI: return id for moderation log entries

deletion-resilience
Alex Gleason 3 years ago
parent
commit
0ec7e9b8e9
No known key found for this signature in database GPG Key ID: 7211D1F99744FBB7
3 changed files with 7 additions and 0 deletions
  1. +1
    -0
      docs/API/admin_api.md
  2. +1
    -0
      lib/pleroma/web/admin_api/views/moderation_log_view.ex
  3. +5
    -0
      test/pleroma/web/admin_api/views/moderation_log_view_test.exs

+ 1
- 0
docs/API/admin_api.md View File

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


+ 1
- 0
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()

%{
id: log_entry.id,
data: log_entry.data,
time: time,
message: ModerationLog.get_log_entry_message(log_entry)


+ 5
- 0
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
setup do
log1 = %Pleroma.ModerationLog{
id: 1,
data: %{
"action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@@ -21,6 +22,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
}

log2 = %Pleroma.ModerationLog{
id: 2,
data: %{
"action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@@ -42,6 +44,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
) == %{
items: [
%{
id: 1,
data: %{
"action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},
@@ -59,6 +62,7 @@ defmodule Pleroma.Web.AdminAPI.ModerationLogViewTest do
time: 1_605_622_400
},
%{
id: 2,
data: %{
"action" => "report_note_delete",
"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
assert ModerationLogView.render("show.json", %{log_entry: log}) == %{
id: 1,
data: %{
"action" => "report_note_delete",
"actor" => %{"id" => "A1I7G8", "nickname" => "admin", "type" => "user"},


Loading…
Cancel
Save