diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-09-10 01:44:32 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-09-11 14:11:00 -0500 |
| commit | e229536e5cca65d811f85d25c86bf3c92b3d8c45 (patch) | |
| tree | 6625c6441e7c990dc4993c1c9c807903e87c7c7e /lib/pleroma/web/admin_api/controllers | |
| parent | 67726453f85eb5bb51bf82e7decf23a4f1d184af (diff) | |
| download | pleroma-e229536e5cca65d811f85d25c86bf3c92b3d8c45.tar.gz | |
Chat Moderation: use explicit `sender` and `recipient` fields
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/chat_controller.ex | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index fccdbabb4..d5713c3dd 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -21,11 +21,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do alias Pleroma.Web.AdminAPI.ModerationLogView alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.Endpoint - alias Pleroma.Web.PleromaAPI alias Pleroma.Web.Router - require Logger - @users_page_size 50 plug( @@ -270,7 +267,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do |> Pleroma.Repo.all() conn - |> put_view(PleromaAPI.ChatView) + |> put_view(AdminAPI.ChatView) |> render("index.json", chats: chats) else _ -> {:error, :not_found} diff --git a/lib/pleroma/web/admin_api/controllers/chat_controller.ex b/lib/pleroma/web/admin_api/controllers/chat_controller.ex index 61d45b970..967600d69 100644 --- a/lib/pleroma/web/admin_api/controllers/chat_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/chat_controller.ex @@ -11,9 +11,9 @@ defmodule Pleroma.Web.AdminAPI.ChatController do alias Pleroma.ModerationLog alias Pleroma.Pagination alias Pleroma.Plugs.OAuthScopesPlug + alias Pleroma.Web.AdminAPI alias Pleroma.Web.CommonAPI alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView - alias Pleroma.Web.PleromaAPI.ChatView require Logger @@ -78,7 +78,7 @@ defmodule Pleroma.Web.AdminAPI.ChatController do def show(conn, %{id: id}) do with %Chat{} = chat <- Chat.get_by_id(id) do conn - |> put_view(ChatView) + |> put_view(AdminAPI.ChatView) |> render("show.json", chat: chat) end end |