projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
utils.ex
diff --git
a/lib/pleroma/web/activity_pub/utils.ex
b/lib/pleroma/web/activity_pub/utils.ex
index 182f9cacbdbc8769bed2cacd36a3d6e605541c28..2e9ffe41c40f5b2fa33049d94f7544cd450af5a0 100644
(file)
--- a/
lib/pleroma/web/activity_pub/utils.ex
+++ b/
lib/pleroma/web/activity_pub/utils.ex
@@
-209,12
+209,12
@@
defmodule Pleroma.Web.ActivityPub.Utils do
"""
def insert_full_object(%{"object" => %{"type" => type} = object_data})
when is_map(object_data) and type in @supported_object_types do
"""
def insert_full_object(%{"object" => %{"type" => type} = object_data})
when is_map(object_data) and type in @supported_object_types do
- with {:ok,
_
} <- Object.create(object_data) do
- :ok
+ with {:ok,
object
} <- Object.create(object_data) do
+ {:ok, object}
end
end
end
end
- def insert_full_object(_), do:
:ok
+ def insert_full_object(_), do:
{:ok, nil}
def update_object_in_activities(%{data: %{"id" => id}} = object) do
# TODO
def update_object_in_activities(%{data: %{"id" => id}} = object) do
# TODO
@@
-621,7
+621,13
@@
defmodule Pleroma.Web.ActivityPub.Utils do
#### Flag-related helpers
def make_flag_data(params, additional) do
#### Flag-related helpers
def make_flag_data(params, additional) do
- status_ap_ids = Enum.map(params.statuses || [], & &1.data["id"])
+ status_ap_ids =
+ Enum.map(params.statuses || [], fn
+ %Activity{} = act -> act.data["id"]
+ act when is_map(act) -> act["id"]
+ act when is_binary(act) -> act
+ end)
+
object = [params.account.ap_id] ++ status_ap_ids
%{
object = [params.account.ap_id] ++ status_ap_ids
%{