From 2afa6d38cf7c8f5daae1ff597ba207cf81783a86 Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 25 Feb 2020 13:14:05 +0100 Subject: Activity: Use more sensible block query --- lib/pleroma/web/activity_pub/activity_pub.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index ea648bd9f..dedda3313 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -949,10 +949,10 @@ defp restrict_blocked(query, %{"blocking_user" => %User{} = user} = opts) do ), where: fragment( - "(not (split_part(?->>'actor', '/', 3) = ANY(?))) or (?->>'actor') = ANY(?)", + "(not (split_part(?->>'actor', '/', 3) = ANY(?))) or (? = ANY(?))", activity.data, ^domain_blocks, - activity.data, + activity.actor, ^following_ap_ids ) ) -- cgit v1.2.3