diff options
| author | lain <lain@soykaf.club> | 2020-04-29 13:19:04 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-29 13:19:04 +0200 |
| commit | 0c491b904d126725866087ad9a51fb6346e2a358 (patch) | |
| tree | 652f0d122a25f28681ed28445b5087fb56681067 /lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | |
| parent | 30ea6bb1674482ef6ddbfd8744f9bd878eae91e9 (diff) | |
| parent | 58fded9858edbeb318dc011cb313e82a86fbafcb (diff) | |
| download | pleroma-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/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index ac8c18f24..e7767de4e 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -15,9 +15,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do require Logger - plug(:skip_plug, Pleroma.Plugs.OAuthScopesPlug when action in [:empty_array, :empty_object]) - - plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug) + plug( + :skip_plug, + [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug] + when action in [:empty_array, :empty_object] + ) action_fallback(Pleroma.Web.MastodonAPI.FallbackController) |