summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-22 15:09:32 +0000
committerlain <lain@soykaf.club>2020-07-22 15:09:32 +0000
commit1c9752cff445ab1f58cea1617d3c7ab73da60e10 (patch)
tree232f995f9acde3e907edf9b88a573d0a2c1841ba /lib
parent96f023be5c3b6d41f610ceecd50320da2aacca8d (diff)
parentb157b7dab36f77b0f30ae18022445d586c242300 (diff)
downloadpleroma-1c9752cff445ab1f58cea1617d3c7ab73da60e10.tar.gz
pleroma-1c9752cff445ab1f58cea1617d3c7ab73da60e10.zip
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
index 33ecd1f70..657f46324 100644
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
@@ -21,8 +21,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
]
)
- @skip_plugs [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.ExpectPublicOrAuthenticatedCheckPlug]
- plug(:skip_plug, @skip_plugs when action in [:archive, :show, :list])
+ @skip_plugs [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug]
+ plug(:skip_plug, @skip_plugs when action in [:index, :show, :archive])
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.PleromaEmojiPackOperation