Merge branch '1996-dont-break-on-chatmessages' into 'develop'

EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808
This commit is contained in:
Haelwenn 2020-07-29 12:20:04 +00:00
commit 269b61a240
2 changed files with 12 additions and 1 deletions

View File

@ -27,7 +27,8 @@ def filter_by_summary(
def filter_by_summary(_in_reply_to, child), do: child def filter_by_summary(_in_reply_to, child), do: child
def filter(%{"type" => "Create", "object" => child_object} = object) do def filter(%{"type" => "Create", "object" => child_object} = object)
when is_map(child_object) do
child = child =
child_object["inReplyTo"] child_object["inReplyTo"]
|> Object.normalize(child_object["inReplyTo"]) |> Object.normalize(child_object["inReplyTo"])

View File

@ -78,5 +78,15 @@ test "it skip if parent and child summary isn't equal" do
assert {:ok, res} = EnsureRePrepended.filter(message) assert {:ok, res} = EnsureRePrepended.filter(message)
assert res == message assert res == message
end end
test "it skips if the object is only a reference" do
message = %{
"type" => "Create",
"object" => "somereference"
}
assert {:ok, res} = EnsureRePrepended.filter(message)
assert res == message
end
end end
end end