hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Mastodon API views in Admin API

Browse source
This commit is contained in:
Maxim Filippov 2019-02-28 17:43:09 +03:00
commit 72b7a0797e
3 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/admin_api/admin_api_controller.ex
View file

@ -8,7 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
use Pleroma.Web, :controller
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Web.MastodonAPI.Admin.AccountView
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
@ -50,7 +50,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
{:ok, updated_user} = User.deactivate(user, !user.info.deactivated)
conn
|> json(UserView.render("show_for_admin.json", %{user: updated_user}))
|> json(AccountView.render("show.json", %{user: updated_user}))
end
def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do
@ -70,7 +70,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
do:
conn
|> json(
UserView.render("index_for_admin.json", %{
AccountView.render("index.json", %{
users: users,
count: count,
page_size: @users_page_size