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

Store status data inside Flag activity

Browse source
This commit is contained in:
Maxim Filippov 2019-10-23 21:27:22 +02:00
commit b08b1d5d91
6 changed files with 62 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.Endpoint
alias Pleroma.Web.Router.Helpers
@ -608,34 +609,24 @@ defmodule Pleroma.Web.ActivityPub.Utils do
defp build_flag_object(%{account: account, statuses: statuses} = _) do
[account.ap_id] ++
Enum.map(statuses || [], fn
%Activity{} = act ->
obj = Object.get_by_ap_id(act.data["object"])
Enum.map(statuses || [], fn act ->
id =
case act do
%Activity{} = act -> act.data["id"]
act when is_map(act) -> act["id"]
act when is_binary(act) -> act
end
%{
"type" => "Note",
"id" => act.data["id"],
"content" => obj.data["content"]
}
activity = Activity.get_by_ap_id_with_object(id)
actor = User.get_by_ap_id(activity.object.data["actor"])
act when is_map(act) ->
obj = Object.get_by_ap_id(act["object"])
%{
"type" => "Note",
"id" => act["id"],
"content" => obj.data["content"]
}
act
when is_binary(act) ->
activity = Activity.get_by_ap_id_with_object(act)
%{
"type" => "Note",
"id" => activity.data["id"],
"content" => activity.data["object"]["content"]
}
%{
"type" => "Note",
"id" => activity.data["id"],
"content" => activity.object.data["content"],
"published" => activity.object.data["published"],
"actor" => AccountView.render("show.json", %{user: actor})
}
end)
end