projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
report_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/report_view.ex
b/lib/pleroma/web/admin_api/views/report_view.ex
index 80ca6269155f71e842866cabb020815a24486905..fc8733ce8e6e20019b040b6b586180ecaf4bf53a 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/report_view.ex
+++ b/
lib/pleroma/web/admin_api/views/report_view.ex
@@
-1,9
+1,10
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportView do
use Pleroma.Web, :view
+ alias Pleroma.Activity
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.Web.AdminAPI.Report
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.Web.AdminAPI.Report
@@
-46,10
+47,16
@@
defmodule Pleroma.Web.AdminAPI.ReportView do
def render("index_grouped.json", %{groups: groups}) do
reports =
Enum.map(groups, fn group ->
def render("index_grouped.json", %{groups: groups}) do
reports =
Enum.map(groups, fn group ->
+ status =
+ case group.status do
+ %Activity{} = activity -> StatusView.render("show.json", %{activity: activity})
+ _ -> group.status
+ end
+
%{
date: group[:date],
account: group[:account],
%{
date: group[:date],
account: group[:account],
- status:
group[:status]
,
+ status:
Map.put_new(status, "deleted", false)
,
actors: Enum.map(group[:actors], &merge_account_views/1),
reports:
group[:reports]
actors: Enum.map(group[:actors], &merge_account_views/1),
reports:
group[:reports]
@@
-69,12
+76,19
@@
defmodule Pleroma.Web.AdminAPI.ReportView do
def render("index_notes.json", _), do: []
def render("index_notes.json", _), do: []
- def render("show_note.json", %{content: content, user_id: user_id}) do
+ def render("show_note.json", %{
+ id: id,
+ content: content,
+ user_id: user_id,
+ inserted_at: inserted_at
+ }) do
user = User.get_by_id(user_id)
%{
user = User.get_by_id(user_id)
%{
+ id: id,
content: content,
content: content,
- user: merge_account_views(user)
+ user: merge_account_views(user),
+ created_at: Utils.to_masto_date(inserted_at)
}
end
}
end