ChatMessageValidator: Validation changes
Don't validate if the recipient is blocking the actor.
This commit is contained in:
parent
6c8390fa4d
commit
2e62a63749
|
@ -61,15 +61,25 @@ def validate_data(data_cng) do
|
||||||
|> validate_local_concern()
|
|> validate_local_concern()
|
||||||
end
|
end
|
||||||
|
|
||||||
@doc "Validates if at least one of the users in this ChatMessage is a local user, otherwise we don't want the message in our system. It also validates the presence of both users in our system."
|
@doc """
|
||||||
|
Validates the following
|
||||||
|
- If both users are in our system
|
||||||
|
- If at least one of the users in this ChatMessage is a local user
|
||||||
|
- If the recipient is not blocking the actor
|
||||||
|
"""
|
||||||
def validate_local_concern(cng) do
|
def validate_local_concern(cng) do
|
||||||
with actor_ap <- get_field(cng, :actor),
|
with actor_ap <- get_field(cng, :actor),
|
||||||
{_, %User{} = actor} <- {:find_actor, User.get_cached_by_ap_id(actor_ap)},
|
{_, %User{} = actor} <- {:find_actor, User.get_cached_by_ap_id(actor_ap)},
|
||||||
{_, %User{} = recipient} <-
|
{_, %User{} = recipient} <-
|
||||||
{:find_recipient, User.get_cached_by_ap_id(get_field(cng, :to) |> hd())},
|
{:find_recipient, User.get_cached_by_ap_id(get_field(cng, :to) |> hd())},
|
||||||
|
{_, false} <- {:blocking_actor?, User.blocks?(recipient, actor)},
|
||||||
{_, true} <- {:local?, Enum.any?([actor, recipient], & &1.local)} do
|
{_, true} <- {:local?, Enum.any?([actor, recipient], & &1.local)} do
|
||||||
cng
|
cng
|
||||||
else
|
else
|
||||||
|
{:blocking_actor?, true} ->
|
||||||
|
cng
|
||||||
|
|> add_error(:actor, "actor is blocked by recipient")
|
||||||
|
|
||||||
{:local?, false} ->
|
{:local?, false} ->
|
||||||
cng
|
cng
|
||||||
|> add_error(:actor, "actor and recipient are both remote")
|
|> add_error(:actor, "actor and recipient are both remote")
|
||||||
|
|
|
@ -33,6 +33,15 @@ test "does not validate if the message is longer than the remote_limit", %{
|
||||||
refute match?({:ok, _object, _meta}, ObjectValidator.validate(valid_chat_message, []))
|
refute match?({:ok, _object, _meta}, ObjectValidator.validate(valid_chat_message, []))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "does not validate if the recipient is blocking the actor", %{
|
||||||
|
valid_chat_message: valid_chat_message,
|
||||||
|
user: user,
|
||||||
|
recipient: recipient
|
||||||
|
} do
|
||||||
|
Pleroma.User.block(recipient, user)
|
||||||
|
refute match?({:ok, _object, _meta}, ObjectValidator.validate(valid_chat_message, []))
|
||||||
|
end
|
||||||
|
|
||||||
test "does not validate if the actor or the recipient is not in our system", %{
|
test "does not validate if the actor or the recipient is not in our system", %{
|
||||||
valid_chat_message: valid_chat_message
|
valid_chat_message: valid_chat_message
|
||||||
} do
|
} do
|
||||||
|
|
Loading…
Reference in New Issue