projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
scrobble_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
index 8665ca56ca667b5525c6cf288478d65d862d9c97..632d6543414787058582977f7e8d5606ca156a21 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex
@@
-7,10
+7,10
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleController do
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
@@
-36,10
+36,7
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleController do
def index(%{assigns: %{user: reading_user}} = conn, %{id: id} = params) do
with %User{} = user <- User.get_cached_by_nickname_or_id(id, for: reading_user) do
def index(%{assigns: %{user: reading_user}} = conn, %{id: id} = params) do
with %User{} = user <- User.get_cached_by_nickname_or_id(id, for: reading_user) do
- params =
- params
- |> Map.new(fn {key, value} -> {to_string(key), value} end)
- |> Map.put("type", ["Listen"])
+ params = Map.put(params, :type, ["Listen"])
activities = ActivityPub.fetch_user_abstract_activities(user, reading_user, params)
activities = ActivityPub.fetch_user_abstract_activities(user, reading_user, params)