diff options
| author | lain <lain@soykaf.club> | 2020-04-29 11:09:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-29 11:09:30 +0000 |
| commit | 58fded9858edbeb318dc011cb313e82a86fbafcb (patch) | |
| tree | 90539822a02e9ff1de91969ad179da907c031b4d /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
| parent | 699fc9569fa06278baaec6804348375cb9891185 (diff) | |
| parent | 4c0e53367acd74de04de070a5e33380f5e457163 (diff) | |
| download | pleroma-58fded9858edbeb318dc011cb313e82a86fbafcb.tar.gz | |
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
Automatic checks of authentication / authorization / instance publicity
See merge request pleroma/pleroma!2409
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/instance_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex index 27b5b1a52..237f85677 100644 --- a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex @@ -5,6 +5,12 @@ defmodule Pleroma.Web.MastodonAPI.InstanceController do use Pleroma.Web, :controller + plug( + :skip_plug, + [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug] + when action in [:show, :peers] + ) + @doc "GET /api/v1/instance" def show(conn, _params) do render(conn, "show.json") |