moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex

This commit is contained in:
lain 2020-03-31 17:28:18 +00:00
parent ecac57732a
commit 1b323ce1c6
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -1267,24 +1267,19 @@ defp maybe_add_context_from_object(_) do
{:error, :no_context} {:error, :no_context}
end end
defp maybe_add_recipients_from_object(%{"object" => object} = data) do defp maybe_add_recipients_from_object(%{"to" => [_ | _], "cc" => [_ | _]} = data), do: {:ok, data}
to = data["to"] || []
cc = data["cc"] || []
if to == [] && cc == [] do defp maybe_add_recipients_from_object(%{"object" => object} = data) do
if object = Object.normalize(object) do case Object.normalize(object) do
%{data: {"actor" => actor}} ->
data = data =
data data
|> Map.put("to", [object.data["actor"]]) |> Map.put("to", [actor])
|> Map.put("cc", cc) |> Map.put("cc", data["cc"] || [])
{:ok, data} {:ok, data}
else nil -> {:error, :no_object}
{:error, "No actor on referenced object"} _ -> {:error, :no_actor}
end
else
{:ok, data}
end
end end
defp maybe_add_recipients_from_object(_) do defp maybe_add_recipients_from_object(_) do