diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 17:12:17 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 17:12:17 +0300 |
| commit | b93856874de673f1c05c557ad482d4480ca7e0a7 (patch) | |
| tree | 53ad43d5626ef8019e2372fc07e3260ab4b25d82 /lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex | |
| parent | 06b3bb54c5567fe82ad2a015673fffba667997ee (diff) | |
| download | pleroma-b93856874de673f1c05c557ad482d4480ca7e0a7.tar.gz pleroma-b93856874de673f1c05c557ad482d4480ca7e0a7.zip | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex b/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex index 9076bb849..fe71c36af 100644 --- a/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex @@ -8,11 +8,16 @@ defmodule Pleroma.Web.MastodonAPI.SuggestionController do require Logger alias Pleroma.Config + alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.User alias Pleroma.Web.MediaProxy action_fallback(Pleroma.Web.MastodonAPI.FallbackController) + plug(OAuthScopesPlug, %{scopes: ["read"]} when action == :index) + + plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug) + @doc "GET /api/v1/suggestions" def index(%{assigns: %{user: user}} = conn, _) do if Config.get([:suggestions, :enabled], false) do |