projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ecto-rollback-in-test-env' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
views
/
scrobble_view.ex
diff --git
a/lib/pleroma/web/pleroma_api/views/scrobble_view.ex
b/lib/pleroma/web/pleroma_api/views/scrobble_view.ex
index bbff93abeb7a1ecd492cfeb647bc196b8b68294b..2bc0695296a0de85ef7104a9424dbd2e09fbf757 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/views/scrobble_view.ex
+++ b/
lib/pleroma/web/pleroma_api/views/scrobble_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ScrobbleView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ScrobbleView do
@@
-10,14
+10,14
@@
defmodule Pleroma.Web.PleromaAPI.ScrobbleView do
alias Pleroma.Activity
alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.Activity
alias Pleroma.HTML
alias Pleroma.Object
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
- alias Pleroma.Web.MastodonAPI.StatusView
def render("show.json", %{activity: %Activity{data: %{"type" => "Listen"}} = activity} = opts) do
def render("show.json", %{activity: %Activity{data: %{"type" => "Listen"}} = activity} = opts) do
- object = Object.normalize(activity)
+ object = Object.normalize(activity
, fetch: false
)
- user =
StatusView
.get_user(activity.data["actor"])
+ user =
CommonAPI
.get_user(activity.data["actor"])
created_at = Utils.to_masto_date(activity.data["published"])
%{
created_at = Utils.to_masto_date(activity.data["published"])
%{