projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/status_view.ex
b/lib/pleroma/web/admin_api/views/status_view.ex
index 500800be2b33306fa7ba255f1398bb10b26402d9..6042a22b6fe0b1d6bd0bbb683b4604aae835b77f 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/status_view.ex
+++ b/
lib/pleroma/web/admin_api/views/status_view.ex
@@
-8,6
+8,7
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
require Pleroma.Constants
alias Pleroma.Web.AdminAPI
require Pleroma.Constants
alias Pleroma.Web.AdminAPI
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI
defdelegate merge_account_views(user), to: AdminAPI.AccountView
alias Pleroma.Web.MastodonAPI
defdelegate merge_account_views(user), to: AdminAPI.AccountView
@@
-17,7
+18,7
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
end
def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do
end
def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do
- user =
MastodonAPI.StatusView
.get_user(activity.data["actor"])
+ user =
CommonAPI
.get_user(activity.data["actor"])
MastodonAPI.StatusView.render("show.json", opts)
|> Map.merge(%{account: merge_account_views(user)})
MastodonAPI.StatusView.render("show.json", opts)
|> Map.merge(%{account: merge_account_views(user)})