projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/static-fe' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
follow_request_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
index ce7b625eeeb5ac583f6ae31cdf66662f6ff91f47..3ccbdf1c65b2febdbad30db18e7fae6e2dfbe3c3 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
use Pleroma.Web, :controller
+ alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.User
alias Pleroma.Web.CommonAPI
@@
-13,6
+14,15
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
action_fallback(:errors)
action_fallback(:errors)
+ plug(OAuthScopesPlug, %{scopes: ["follow", "read:follows"]} when action == :index)
+
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["follow", "write:follows"]} when action != :index
+ )
+
+ plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
+
@doc "GET /api/v1/follow_requests"
def index(%{assigns: %{user: followed}} = conn, _params) do
follow_requests = User.get_follow_requests(followed)
@doc "GET /api/v1/follow_requests"
def index(%{assigns: %{user: followed}} = conn, _params) do
follow_requests = User.get_follow_requests(followed)