aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-29 13:19:04 +0200
committerlain <lain@soykaf.club>2020-04-29 13:19:04 +0200
commit0c491b904d126725866087ad9a51fb6346e2a358 (patch)
tree652f0d122a25f28681ed28445b5087fb56681067 /lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
parent30ea6bb1674482ef6ddbfd8744f9bd878eae91e9 (diff)
parent58fded9858edbeb318dc011cb313e82a86fbafcb (diff)
downloadpleroma-0c491b904d126725866087ad9a51fb6346e2a358.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex b/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
index 3bfebef8b..000ad743f 100644
--- a/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
@@ -7,6 +7,12 @@ defmodule Pleroma.Web.MastodonAPI.CustomEmojiController do
plug(OpenApiSpex.Plug.CastAndValidate)
+ plug(
+ :skip_plug,
+ [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug]
+ when action == :index
+ )
+
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.CustomEmojiOperation
def index(conn, _params) do