diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-29 17:03:17 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-29 17:03:17 +0300 |
| commit | 7ef37ed99db69d8553e638e88527ded475f54a5f (patch) | |
| tree | e2a6bae013f29ca7d6a8dfb69be1aa13d0a6b5af /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
| parent | 37998e43636265d7709dbbf4926b07b7f94e04ea (diff) | |
| parent | 58fded9858edbeb318dc011cb313e82a86fbafcb (diff) | |
| download | pleroma-7ef37ed99db69d8553e638e88527ded475f54a5f.tar.gz | |
merge develop
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") |