Merge branch 'feature/update-labels-for-activating-settings' into 'develop'

[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
index 83a7f03e8b0a382493d2eae290e674523bc0417c..d276b96a41a9343e16567220eb6451da2603c371 100644 (file)
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
     Pleroma.Plugs.OAuthScopesPlug,
     %{scopes: ["write"], admin: true}
     when action in [
-           :import,
+           :import_from_filesystem,
            :remote,
            :download,
            :create,
@@ -22,7 +22,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
   plug(
     :skip_plug,
     [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.ExpectPublicOrAuthenticatedCheckPlug]
-    when action in [:download_shared, :list_packs, :list_from]
+    when action in [:archive, :show, :list]
   )
 
   def remote(conn, %{"url" => url}) do
@@ -287,7 +287,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
     with {:ok, names} <- Pack.import_from_filesystem() do
       json(conn, names)
     else
-      {:error, :not_writable} ->
+      {:error, :no_read_write} ->
         conn
         |> put_status(:internal_server_error)
         |> json(%{error: "Error: emoji pack directory must be writable"})