diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-17 20:12:44 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-17 20:12:44 +0000 |
| commit | 8c65b69d4a536311347a27f85198d2883fcd03b8 (patch) | |
| tree | b6367f0177e4b36653c6c0160eceb7c80d9b52cc /lib | |
| parent | 8de17c480e4267a46ae8d862a3c8918aa6734c39 (diff) | |
| parent | 2140e164d75e053a6b6c6131c939ae5ce9eebf03 (diff) | |
| download | pleroma-8c65b69d4a536311347a27f85198d2883fcd03b8.tar.gz pleroma-8c65b69d4a536311347a27f85198d2883fcd03b8.zip | |
Merge branch 'feature/improve-block-filtering' into 'develop'
activitypub: properly filter out transitive activities concerning blocked users
See merge request pleroma/pleroma!1072
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 54dd4097c..68317ee6a 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -712,7 +712,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do from( activity in query, where: fragment("not (? = ANY(?))", activity.actor, ^blocks), - where: fragment("not (?->'to' \\?| ?)", activity.data, ^blocks), + where: fragment("not (? && ?)", activity.recipients, ^blocks), where: fragment("not (split_part(?, '/', 3) = ANY(?))", activity.actor, ^domain_blocks) ) end |