aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/admin_api/controllers/instance_controller.ex8
-rw-r--r--lib/pleroma/web/router.ex4
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/instance_controller.ex b/lib/pleroma/web/admin_api/controllers/instance_controller.ex
index 2fc2fb442..00857983f 100644
--- a/lib/pleroma/web/admin_api/controllers/instance_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/instance_controller.ex
@@ -19,18 +19,18 @@ defmodule Pleroma.Web.AdminAPI.InstanceController do
plug(
OAuthScopesPlug,
%{scopes: ["admin:read:statuses"]}
- when action in [:list_instance_statuses]
+ when action in [:list_statuses]
)
plug(
OAuthScopesPlug,
%{scopes: ["admin:write:accounts", "admin:write:statuses"]}
- when action in [:delete_instance]
+ when action in [:delete]
)
action_fallback(AdminAPI.FallbackController)
- def list_instance_statuses(conn, %{"instance" => instance} = params) do
+ def list_statuses(conn, %{"instance" => instance} = params) do
with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true
{page, page_size} = page_params(params)
@@ -48,7 +48,7 @@ defmodule Pleroma.Web.AdminAPI.InstanceController do
|> render("index.json", %{total: result[:total], activities: result[:items], as: :activity})
end
- def delete_instance(conn, %{"instance" => instance}) do
+ def delete(conn, %{"instance" => instance}) do
with {:ok, _job} <- Instance.delete_users_and_activities(instance) do
json(conn, instance)
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 1f465b697..3e2ecc2c0 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -209,8 +209,8 @@ defmodule Pleroma.Web.Router do
get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
get("/users/:nickname/chats", AdminAPIController, :list_user_chats)
- get("/instances/:instance/statuses", InstanceController, :list_instance_statuses)
- delete("/instances/:instance", InstanceController, :delete_instance)
+ get("/instances/:instance/statuses", InstanceController, :list_statuses)
+ delete("/instances/:instance", InstanceController, :delete)
get("/instance_document/:name", InstanceDocumentController, :show)
patch("/instance_document/:name", InstanceDocumentController, :update)