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

utils: Fix maybe_splice_recipient when "object" isn’t a map

This commit is contained in:
Haelwenn (lanodan) Monnier 2020-11-27 00:25:24 +01:00
parent 0b88accae6
commit 53193b84b1
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/maps.ex
View File

@ -12,4 +12,10 @@ def put_if_present(map, key, value, value_function \\ &{:ok, &1}) when is_map(ma
_ -> map _ -> map
end end
end end
def safe_put_in(data, keys, value) when is_map(data) and is_list(keys) do
Kernel.put_in(data, keys, value)
rescue
_ -> data
end
end end

6
lib/pleroma/web/activity_pub/utils.ex
View File

@ -96,11 +96,11 @@ def maybe_splice_recipient(ap_id, params) do
!label_in_collection?(ap_id, params["cc"]) !label_in_collection?(ap_id, params["cc"])
if need_splice? do if need_splice? do
cc_list = extract_list(params["cc"]) cc = [ap_id | extract_list(params["cc"])]
params params
|> Map.put("cc", [ap_id | cc_list]) |> Map.put("cc", cc)
|> Kernel.put_in(["object", "cc"], [ap_id | cc_list]) |> Maps.safe_put_in(["object", "cc"], cc)
else else
params params
end end

1
test/pleroma/web/activity_pub/activity_pub_controller_test.exs
View File

@ -1003,7 +1003,6 @@ test "forwarded report from mastodon", %{conn: conn} do
"actor" => remote_actor, "actor" => remote_actor,
"content" => "test report", "content" => "test report",
"id" => "https://#{remote_domain}/e3b12fd1-948c-446e-b93b-a5e67edbe1d8", "id" => "https://#{remote_domain}/e3b12fd1-948c-446e-b93b-a5e67edbe1d8",
"nickname" => reported_user.nickname,
"object" => [ "object" => [
reported_user.ap_id, reported_user.ap_id,
note.data["object"] note.data["object"]