fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-26 10:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'admin-api/account-view' into 'develop'

Browse source 
Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request pleroma/pleroma!2627
This commit is contained in:
lain 2020-06-03 11:28:56 +00:00
parent 12c2b3b831 8a43611e01
commit d28d88766b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
View file

@ -30,7 +30,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.AdminAPI.Search
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Endpoint alias Pleroma.Web.Endpoint
alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.Router alias Pleroma.Web.Router
require Logger require Logger
@ -279,7 +278,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
}) })
conn conn
|> put_view(MastodonAPI.StatusView) |> put_view(AdminAPI.StatusView)
|> render("index.json", %{activities: activities, as: :activity}) |> render("index.json", %{activities: activities, as: :activity})
else else
_ -> {:error, :not_found} _ -> {:error, :not_found}