X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fadmin_api%2Fviews%2Freport_view.ex;h=ca0bcebc751a138aa66dca1888a5fa0e0c111d57;hb=dbcfac11b45b367185a3b18a2db3e3fb07e8f20d;hp=f5c6ba40146851b73a82f2757c185e61e84162d0;hpb=08c89fd2b89614baaf4bfce067cfec9db96f2d2c;p=akkoma
diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex
index f5c6ba401..ca0bcebc7 100644
--- 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
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportView do
use Pleroma.Web, :view
+
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.Web.AdminAPI.Report
@@ -43,39 +44,25 @@ defmodule Pleroma.Web.AdminAPI.ReportView do
}
end
- def render("index_grouped.json", %{groups: groups}) do
- reports =
- Enum.map(groups, fn group ->
- %{
- date: group[:date],
- account: group[:account],
- status: group[:status],
- actors: Enum.map(group[:actors], &merge_account_views/1),
- reports:
- group[:reports]
- |> Enum.map(&Report.extract_report_info(&1))
- |> Enum.map(&render(__MODULE__, "show.json", &1))
- }
- end)
-
- %{
- reports: reports
- }
- end
-
def render("index_notes.json", %{notes: notes}) when is_list(notes) do
Enum.map(notes, &render(__MODULE__, "show_note.json", &1))
end
def render("index_notes.json", _), do: []
- def render("show_note.json", %{content: content, user_id: user_id, inserted_at: inserted_at}) 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)
%{
+ id: id,
content: content,
user: merge_account_views(user),
- created_at: inserted_at
+ created_at: Utils.to_masto_date(inserted_at)
}
end