Move emoji reloading to admin api

This commit is contained in:
Ekaterina Vaartis 2019-09-12 20:38:57 +03:00
commit d51e5e447e
5 changed files with 15 additions and 20 deletions

View file

@ -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)

View file

@ -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"

View file

@ -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])