Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / web / admin_api / admin_api_controller.ex

diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 12b36a1c081cb9c24d8f85a951c0ee12cee5463e..6d9bf289502f617ea40adffc3a3278fa43e616cc 100644 (file)
--- 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]
 
@@ -63,21 +63,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
          do: json_response(conn, :no_content, "")
   end
 
-  # def list_users(conn, params) do
-  #   {page, page_size} = page_params(params)
-
-  #   with {:ok, users, count} <- User.all_for_admin(page, page_size),
-  #        do:
-  #          conn
-  #          |> json(
-  #            AccountView.render("index.json",
-  #              users: users,
-  #              count: count,
-  #              page_size: page_size
-  #            )
-  #          )
-  # end
-
   def list_users(%{assigns: %{user: admin}} = conn, params) do
     {page, page_size} = page_params(params)