diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-22 10:31:04 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-22 10:31:04 -0600 |
| commit | 07c30c9e6ef5eae5e2c5d0e919750884409a5fc8 (patch) | |
| tree | 1d617aa06947e565f72b31517f28a6fd3d88adae /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
| parent | 682f0aa2597bec4ef80691daddae1d87ddeeae0a (diff) | |
| parent | 9c1cb87eff1fdd20f47355971831545a79c7cd3a (diff) | |
| download | pleroma-07c30c9e6ef5eae5e2c5d0e919750884409a5fc8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into 2061-chat-deletion
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/instance_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex index 07a32491a..5376e4594 100644 --- a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex @@ -1,17 +1,13 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only 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 |