Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2

This commit is contained in:
lain 2020-03-31 19:06:08 +02:00
commit 51fc504705
1 changed files with 2 additions and 2 deletions

View File

@ -1267,7 +1267,7 @@ defp maybe_add_context_from_object(%{"object" => object} = data) when is_binary(
end end
defp maybe_add_context_from_object(_) do defp maybe_add_context_from_object(_) do
{:error, "No referenced object"} {:error, :no_context}
end end
defp maybe_add_recipients_from_object(%{"object" => object} = data) do defp maybe_add_recipients_from_object(%{"object" => object} = data) do
@ -1291,6 +1291,6 @@ defp maybe_add_recipients_from_object(%{"object" => object} = data) do
end end
defp maybe_add_recipients_from_object(_) do defp maybe_add_recipients_from_object(_) do
{:error, "No referenced object"} {:error, :no_object}
end end
end end