Move emoji reloading to admin api

diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md
index 7637fa0d408728be4aa26ae5ce82549edc84c853..0377ea6553ee0ca0f29952a0f937b7bbc40b84e7 100644 (file)
--- a/docs/api/admin_api.md
+++ b/docs/api/admin_api.md
@@ -733,3 +733,10 @@ Compile time settings (need instance reboot):
   }
 ]
 ```
+
+## `POST /api/pleroma/admin/reload_emoji`
+### Reload the instance's custom emoji
+* Method `POST`
+* Authentication: required
+* Params: None
+* Response: JSON, "ok" and 200 status

diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md
index a7e7fbe253d54d9bba02e90644ac8ab379659fc8..05a4e6fcc644903d30e7fd7c41d518d8b327e64d 100644 (file)
--- a/docs/api/pleroma_api.md
+++ b/docs/api/pleroma_api.md
@@ -366,14 +366,6 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
     * `recipients`: A list of ids of users that should receive posts to this conversation. This will replace the current list of recipients, so submit the full list. The owner of owner of the conversation will always be part of the set of recipients, though.
 * Response: JSON, statuses (200 - healthy, 503 unhealthy)
 
-
-## `POST /api/pleroma/emoji/reload`
-### Reload the instance's custom emoji
-* Method `POST`
-* Authentication: required
-* Params: None
-* Response: JSON, "ok" and 200 status
-
 ## `PUT /api/pleroma/emoji/packs/:name`
 ### Creates an empty custom emoji pack
 * Method `PUT`

diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 8a8091daa2e39cf3375e13294febff14bdabaaed..4d4e862dd9a9992bd1be6f1d767f97086e977cb2 100644 (file)
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -599,6 +599,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
     |> render("index.json", %{configs: updated})
   end
 
+  def reload_emoji(conn, _params) do
+    Pleroma.Emoji.reload()
+
+    conn |> json("ok")
+  end
+
   def errors(conn, {:error, :not_found}) do
     conn
     |> put_status(:not_found)

diff --git a/lib/pleroma/web/pleroma_api/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/emoji_api_controller.ex
index 36ca2c8048fcf974812369d7f738fd836a05eb65..bc163909587d4b0720a4e8fbecec0588131cd8b4 100644 (file)
--- a/lib/pleroma/web/pleroma_api/emoji_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/emoji_api_controller.ex
@@ -3,12 +3,6 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
 
   require Logger
 
-  def reload(conn, _params) do
-    Pleroma.Emoji.reload()
-
-    conn |> json("ok")
-  end
-
   @emoji_dir_path Path.join(
                     Pleroma.Config.get!([:instance, :static_dir]),
                     "emoji"

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 715e4ba68987128d77c4c1c6f8206bf8e5cb7aaf..71ef382c521c93db7f2f13f482d30a9b75b6b245 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -205,15 +205,11 @@ defmodule Pleroma.Web.Router do
     get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)
 
     get("/moderation_log", AdminAPIController, :list_log)
+
+    post("/reload_emoji", AdminAPIController, :reload_emoji)
   end
 
   scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
-    scope [] do
-      pipe_through([:admin_api, :oauth_write])
-
-      post("/reload", EmojiAPIController, :reload)
-    end
-
     scope "/packs" do
       # Modifying packs
       pipe_through([:admin_api, :oauth_write])