diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
| commit | decaa64f75f8bd69622fa5fba757f99719f09808 (patch) | |
| tree | 52d3bfc7318230beae31865c7f0a12e02b7f68b5 /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
| parent | 764b4f95a8e9e751d5a6136fc2be44d61a082443 (diff) | |
| parent | c297667f16db40654bb16608c01dc4a2dc7c0e4b (diff) | |
| download | pleroma-decaa64f75f8bd69622fa5fba757f99719f09808.tar.gz | |
Merge branch 'develop' into global-status-expiration
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") |