projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'remove-twitter-api'
[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 6f2b2b09ccd69c6fb168f396247d52c4be74fabe..3637dee24eb42fef069b9307bd5ad04a40bf3b87 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/status_view.ex
+++ b/
lib/pleroma/web/admin_api/views/status_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
@@
-8,15
+8,16
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
require Pleroma.Constants
alias Pleroma.User
require Pleroma.Constants
alias Pleroma.User
+ alias Pleroma.Web.MastodonAPI.StatusView
def render("index.json", opts) do
def render("index.json", opts) do
- render_many(opts.activities, __MODULE__, "show.json", opts)
+
safe_
render_many(opts.activities, __MODULE__, "show.json", opts)
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 = get_user(activity.data["actor"])
+ user =
StatusView.
get_user(activity.data["actor"])
-
Pleroma.Web.MastodonAPI.
StatusView.render("show.json", opts)
+ StatusView.render("show.json", opts)
|> Map.merge(%{account: merge_account_views(user)})
end
|> Map.merge(%{account: merge_account_views(user)})
end
@@
-26,17
+27,4
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
end
defp merge_account_views(_), do: %{}
end
defp merge_account_views(_), do: %{}
-
- defp get_user(ap_id) do
- cond do
- user = User.get_cached_by_ap_id(ap_id) ->
- user
-
- user = User.get_by_guessed_nickname(ap_id) ->
- user
-
- true ->
- User.error_user(ap_id)
- end
- end
end
end