Merge branch 'replies-domain-block' into 'develop'
Replies domain block Closes #1650 See merge request pleroma/pleroma!2622
This commit is contained in:
commit
879304dcd9
7 changed files with 387 additions and 173 deletions
|
|
@ -936,6 +936,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
[activity, object: o] in query,
|
||||
where: fragment("not (? = ANY(?))", activity.actor, ^blocked_ap_ids),
|
||||
where: fragment("not (? && ?)", activity.recipients, ^blocked_ap_ids),
|
||||
where:
|
||||
fragment(
|
||||
"recipients_contain_blocked_domains(?, ?) = false",
|
||||
activity.recipients,
|
||||
^domain_blocks
|
||||
),
|
||||
where:
|
||||
fragment(
|
||||
"not (?->>'type' = 'Announce' and ?->'to' \\?| ?)",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue