diff options
author | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
commit | 35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch) | |
tree | 0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex | |
parent | 7aceaa517be7b109a9acc15fb4914535b536b66c (diff) | |
parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
download | pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex')
-rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex b/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex index 0fb978c5d..b74b3debc 100644 --- a/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex @@ -7,11 +7,17 @@ defmodule Pleroma.Web.PleromaAPI.ScrobbleController do import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2, fetch_integer_param: 2] + alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub 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(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug) + def new_scrobble(%{assigns: %{user: user}} = conn, %{"title" => _} = params) do params = if !params["length"] do |