diff options
| author | lain <lain@soykaf.club> | 2020-06-02 14:14:23 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-02 14:14:23 +0000 |
| commit | 879304dcd94c778b3cdaa2b82f69fccf2b37090c (patch) | |
| tree | 324d8e0cfa1f73f5180af462ebb95cba0cc6c769 /lib | |
| parent | 5da38c15cd9b1701d5ca52be1036f2865c9f884e (diff) | |
| parent | 19f468c5bc230d6790b00aa87e509a07e709aaa7 (diff) | |
| download | pleroma-879304dcd94c778b3cdaa2b82f69fccf2b37090c.tar.gz | |
Merge branch 'replies-domain-block' into 'develop'
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index a38f9a3c8..958f3e5af 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -938,6 +938,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do 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' \\?| ?)", activity.data, activity.data, |