aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
committerAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
commit44ede0657f2da0a761de76b1f9822a293430d497 (patch)
tree387a8915bdb6ff1295f4f0872b2e6bc97e177831 /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex
parent1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff)
parentd8a986c9e893de8eed3aa336a557695669b1ffee (diff)
downloadpleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz
Merge remote-tracking branch 'pleroma/develop' into staff-plug
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/instance_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/instance_controller.ex8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex
index 267d0f03b..5376e4594 100644
--- a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex
@@ -5,13 +5,9 @@
defmodule Pleroma.Web.MastodonAPI.InstanceController do
use Pleroma.Web, :controller
- plug(OpenApiSpex.Plug.CastAndValidate)
+ plug(Pleroma.Web.ApiSpec.CastAndValidate)
- plug(
- :skip_plug,
- [Pleroma.Web.Plugs.OAuthScopesPlug, Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug]
- when action in [:show, :peers]
- )
+ plug(:skip_auth when action in [:show, :peers])
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.InstanceOperation