hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Flag an Object, not an Activity

Browse source
This commit is contained in:
tusooa 2022-11-19 23:51:43 -05:00
commit a69e9ae2ef
No known key found for this signature in database
GPG key ID: 7B467EDE43A08224
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/pleroma/web/activity_pub/utils.ex
View file

@ -695,8 +695,9 @@ defmodule Pleroma.Web.ActivityPub.Utils do
Enum.map(statuses || [], &build_flag_object/1)
end
defp build_flag_object(%Activity{data: %{"id" => id}, object: %{data: data}}) do
activity_actor = User.get_by_ap_id(data["actor"])
defp build_flag_object(%Object{data: data}) do
actor = User.get_by_ap_id(data["actor"])
id = data["id"]
%{
"type" => "Note",
@ -706,7 +707,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
"actor" =>
AccountView.render(
"show.json",
%{user: activity_actor, skip_visibility_check: true}
%{user: actor, skip_visibility_check: true}
)
}
end
@ -720,12 +721,12 @@ defmodule Pleroma.Web.ActivityPub.Utils do
end
case Activity.get_by_ap_id_with_object(id) do
%Activity{} = activity ->
build_flag_object(activity)
%Activity{object: object} = _ ->
build_flag_object(object)
nil ->
if activity = Activity.get_by_object_ap_id_with_object(id) do
build_flag_object(activity)
if %Object{} = object = Object.get_by_ap_id(id) do
build_flag_object(object)
else
%{"id" => id, "deleted" => true}
end