projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Correct og:description tag in static-fe' (#373) from sfr/akkoma...
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
moderation_log_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/moderation_log_view.ex
b/lib/pleroma/web/admin_api/views/moderation_log_view.ex
index b3fc7cfe57106c9d01fadfd45a42e061bab72bfe..b3a9efff39899c1f073317b83b0852e2baa1bedc 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/moderation_log_view.ex
+++ b/
lib/pleroma/web/admin_api/views/moderation_log_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ModerationLogView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ModerationLogView do
@@
-8,7
+8,10
@@
defmodule Pleroma.Web.AdminAPI.ModerationLogView do
alias Pleroma.ModerationLog
def render("index.json", %{log: log}) do
alias Pleroma.ModerationLog
def render("index.json", %{log: log}) do
- render_many(log, __MODULE__, "show.json", as: :log_entry)
+ %{
+ items: render_many(log.items, __MODULE__, "show.json", as: :log_entry),
+ total: log.count
+ }
end
def render("show.json", %{log_entry: log_entry}) do
end
def render("show.json", %{log_entry: log_entry}) do
@@
-18,6
+21,7
@@
defmodule Pleroma.Web.AdminAPI.ModerationLogView do
|> DateTime.to_unix()
%{
|> DateTime.to_unix()
%{
+ id: log_entry.id,
data: log_entry.data,
time: time,
message: ModerationLog.get_log_entry_message(log_entry)
data: log_entry.data,
time: time,
message: ModerationLog.get_log_entry_message(log_entry)