projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 7af9d38a1e71b960a47688d89fcca1cd2608eb37..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 [
Pleroma.Plugs.OAuthScopesPlug,
%{scopes: ["write"], admin: true}
when action in [
- :import,
+ :import
_from_filesystem
,
:remote,
:download,
:create,
:remote,
:download,
:create,
@@
-22,7
+22,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIController do
plug(
:skip_plug,
[Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.ExpectPublicOrAuthenticatedCheckPlug]
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
)
def remote(conn, %{"url" => url}) do