From cc0f2f8ba3f8a8f2909722d34d95523218536267 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 13 Mar 2019 04:13:28 +0100 Subject: =?UTF-8?q?MastodonAPI.Admin.AccountView=20=E2=86=92=20AdminAPI.Ac?= =?UTF-8?q?countView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pleroma/web/admin_api/admin_api_controller.ex | 2 +- lib/pleroma/web/admin_api/views/account_view.ex | 27 ++++++++++++++++++++++ .../web/mastodon_api/views/admin/account_view.ex | 27 ---------------------- 3 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 lib/pleroma/web/admin_api/views/account_view.ex delete mode 100644 lib/pleroma/web/mastodon_api/views/admin/account_view.ex (limited to 'lib') diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 75c2c6061..6d9bf2895 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -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.MastodonAPI.Admin.AccountView + alias Pleroma.Web.AdminAPI.AccountView import Pleroma.Web.ControllerHelper, only: [json_response: 3] diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex new file mode 100644 index 000000000..c022fb07d --- /dev/null +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -0,0 +1,27 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.Web.AdminAPI.AccountView do + use Pleroma.Web, :view + + alias Pleroma.User.Info + alias Pleroma.Web.AdminAPI.AccountView + + def render("index.json", %{users: users, count: count, page_size: page_size}) do + %{ + users: render_many(users, AccountView, "show.json", as: :user), + count: count, + page_size: page_size + } + end + + def render("show.json", %{user: user}) do + %{ + "id" => user.id, + "nickname" => user.nickname, + "deactivated" => user.info.deactivated, + "roles" => Info.roles(user.info) + } + end +end diff --git a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex b/lib/pleroma/web/mastodon_api/views/admin/account_view.ex deleted file mode 100644 index 5ce017124..000000000 --- a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex +++ /dev/null @@ -1,27 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.MastodonAPI.Admin.AccountView do - use Pleroma.Web, :view - - alias Pleroma.User.Info - alias Pleroma.Web.MastodonAPI.Admin.AccountView - - def render("index.json", %{users: users, count: count, page_size: page_size}) do - %{ - users: render_many(users, AccountView, "show.json", as: :user), - count: count, - page_size: page_size - } - end - - def render("show.json", %{user: user}) do - %{ - "id" => user.id, - "nickname" => user.nickname, - "deactivated" => user.info.deactivated, - "roles" => Info.roles(user.info) - } - end -end -- cgit v1.2.3