|
|
|
@ -56,23 +56,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|
|
|
|
end)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def get_user(ap_id, fake_record_fallback \\ true) do
|
|
|
|
|
cond do
|
|
|
|
|
user = User.get_cached_by_ap_id(ap_id) ->
|
|
|
|
|
user
|
|
|
|
|
|
|
|
|
|
user = User.get_by_guessed_nickname(ap_id) ->
|
|
|
|
|
user
|
|
|
|
|
|
|
|
|
|
fake_record_fallback ->
|
|
|
|
|
# TODO: refactor (fake records is never a good idea)
|
|
|
|
|
User.error_user(ap_id)
|
|
|
|
|
|
|
|
|
|
true ->
|
|
|
|
|
nil
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp get_context_id(%{data: %{"context_id" => context_id}}) when not is_nil(context_id),
|
|
|
|
|
do: context_id
|
|
|
|
|
|
|
|
|
@ -120,7 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|
|
|
|
# Note: unresolved users are filtered out
|
|
|
|
|
actors =
|
|
|
|
|
(activities ++ parent_activities)
|
|
|
|
|
|> Enum.map(&get_user(&1.data["actor"], false))
|
|
|
|
|
|> Enum.map(&CommonAPI.get_user(&1.data["actor"], false))
|
|
|
|
|
|> Enum.filter(& &1)
|
|
|
|
|
|
|
|
|
|
UserRelationship.view_relationships_option(reading_user, actors, subset: :source_mutes)
|
|
|
|
@ -139,7 +122,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|
|
|
|
"show.json",
|
|
|
|
|
%{activity: %{data: %{"type" => "Announce", "object" => _object}} = activity} = opts
|
|
|
|
|
) do
|
|
|
|
|
user = get_user(activity.data["actor"])
|
|
|
|
|
user = CommonAPI.get_user(activity.data["actor"])
|
|
|
|
|
created_at = Utils.to_masto_date(activity.data["published"])
|
|
|
|
|
activity_object = Object.normalize(activity)
|
|
|
|
|
|
|
|
|
@ -212,7 +195,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|
|
|
|
def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do
|
|
|
|
|
object = Object.normalize(activity)
|
|
|
|
|
|
|
|
|
|
user = get_user(activity.data["actor"])
|
|
|
|
|
user = CommonAPI.get_user(activity.data["actor"])
|
|
|
|
|
user_follower_address = user.follower_address
|
|
|
|
|
|
|
|
|
|
like_count = object.data["like_count"] || 0
|
|
|
|
@ -266,7 +249,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|
|
|
|
|
|
|
|
|
reply_to = get_reply_to(activity, opts)
|
|
|
|
|
|
|
|
|
|
reply_to_user = reply_to && get_user(reply_to.data["actor"])
|
|
|
|
|
reply_to_user = reply_to && CommonAPI.get_user(reply_to.data["actor"])
|
|
|
|
|
|
|
|
|
|
content =
|
|
|
|
|
object
|
|
|
|
|