projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/notifsettings-breaking-login' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
mastodon_api_controller.ex
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 f0492b1893b78302ba90c336d72ff48630667c95..a1bcc91d978701105e1e03e9a1f9e7d9d013a55d 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
@@
-15,7
+15,11
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
require Logger
require Logger
- plug(:skip_plug, Pleroma.Plugs.OAuthScopesPlug when action in [:empty_array, :empty_object])
+ plug(
+ :skip_plug,
+ [Pleroma.Web.Plugs.OAuthScopesPlug, Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug]
+ when action in [:empty_array, :empty_object]
+ )
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)