From 48380aecccc74b0a376ed1efb55a269b35516566 Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 14 Apr 2018 14:26:20 +0300 Subject: ActivityPub.ex: do not return boosted statuses from blocked users. --- lib/pleroma/web/activity_pub/activity_pub.ex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 04b50c1cc..37fbf3d6d 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -307,7 +307,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do blocks = info["blocks"] || [] - from(activity in query, where: fragment("not (? = ANY(?))", activity.actor, ^blocks)) + from(activity in query, + where: fragment("not (? = ANY(?))", activity.actor, ^blocks), + where: fragment("not (?->'to' \\?| ?)", activity.data, ^blocks) + ) end defp restrict_blocked(query, _), do: query -- cgit v1.2.3