diff options
| author | eal <eal@waifu.club> | 2018-04-14 14:26:20 +0300 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-04-14 14:26:20 +0300 |
| commit | 48380aecccc74b0a376ed1efb55a269b35516566 (patch) | |
| tree | 8dcaddc8b96d1ad07df8f852416c9d1214f1ab36 /lib | |
| parent | b910483c16e231f107d0c4e8c76f60a6a1bd1a79 (diff) | |
| download | pleroma-48380aecccc74b0a376ed1efb55a269b35516566.tar.gz | |
ActivityPub.ex: do not return boosted statuses from blocked users.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 5 |
1 files changed, 4 insertions, 1 deletions
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 |