aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-29 13:19:04 +0200
committerlain <lain@soykaf.club>2020-04-29 13:19:04 +0200
commit0c491b904d126725866087ad9a51fb6346e2a358 (patch)
tree652f0d122a25f28681ed28445b5087fb56681067 /lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
parent30ea6bb1674482ef6ddbfd8744f9bd878eae91e9 (diff)
parent58fded9858edbeb318dc011cb313e82a86fbafcb (diff)
downloadpleroma-0c491b904d126725866087ad9a51fb6346e2a358.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex b/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
index 4463ec477..22da6c0ad 100644
--- a/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
@@ -13,10 +13,12 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleController do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.StatusView
- plug(OAuthScopesPlug, %{scopes: ["read"]} when action == :user_scrobbles)
- plug(OAuthScopesPlug, %{scopes: ["write"]} when action != :user_scrobbles)
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["read"], fallback: :proceed_unauthenticated} when action == :user_scrobbles
+ )
- plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
+ plug(OAuthScopesPlug, %{scopes: ["write"]} when action != :user_scrobbles)
def new_scrobble(%{assigns: %{user: user}} = conn, %{"title" => _} = params) do
params =