hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make unaddressed_message? condsider [] as empty

Browse source
This commit is contained in:
Ekaterina Vaartis 2025-06-19 12:36:31 +03:00
commit 871e9e8492
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/fix-report-empty-fields.fix Normal file
View file

@ -0,0 +1 @@
Fix reports being rejected when the activity had an empty CC or TO field (instead of not having them at all)

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

@ -82,7 +82,11 @@ defmodule Pleroma.Web.ActivityPub.Utils do
def unaddressed_message?(params), def unaddressed_message?(params),
do: do:
[params["to"], params["cc"], params["bto"], params["bcc"]] [params["to"], params["cc"], params["bto"], params["bcc"]]
|> Enum.all?(&is_nil(&1)) |> Enum.all?(fn
nil -> true
[] -> true
_ -> false
end)
@spec recipient_in_message(User.t(), User.t(), map()) :: boolean() @spec recipient_in_message(User.t(), User.t(), map()) :: boolean()
def recipient_in_message(%User{ap_id: ap_id} = recipient, %User{} = actor, params), def recipient_in_message(%User{ap_id: ap_id} = recipient, %User{} = actor, params),

5
test/pleroma/web/activity_pub/activity_pub_controller_test.exs
View file

@ -1205,9 +1205,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
} }
], ],
"actor" => actor.ap_id, "actor" => actor.ap_id,
"cc" => [ # CC and TO might either not exist at all, or be empty. We should be able to handle either.
reported_user.ap_id # "cc" => [],
],
"content" => "test", "content" => "test",
"context" => "context", "context" => "context",
"id" => "http://#{remote_domain}/activities/02be56cf-35e3-46b4-b2c6-47ae08dfee9e", "id" => "http://#{remote_domain}/activities/02be56cf-35e3-46b4-b2c6-47ae08dfee9e",