aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2022-01-09 15:29:55 -0600
committerAlex Gleason <alex@alexgleason.me>2022-01-09 15:29:55 -0600
commitc04afbbfb460a390c41a368bbffec6230c96053b (patch)
tree76d3c41b055c0ae08765c5f21ad324c14dc07546
parentf9ae674a579b01849f2c5b757030c8ca8292e815 (diff)
downloadpleroma-c04afbbfb460a390c41a368bbffec6230c96053b.tar.gz
ActivityPub: change blocking/blockers queries to make timelines load again
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex4
1 files 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 e97f9c138..b346408e6 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1036,7 +1036,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
from(
[activity, object: o] in query,
# You don't block the author
- where: fragment("not (? = ANY(?))", activity.actor, ^blocked_ap_ids),
+ where: fragment("not (? && ?)", [activity.actor], ^blocked_ap_ids),
# You don't block any recipients, and didn't author the post
where:
@@ -1100,7 +1100,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
from(
activity in query,
# The author doesn't block you
- where: fragment("not (? = ANY(?))", activity.actor, ^blocker_ap_ids),
+ where: fragment("not (? && ?)", [activity.actor], ^blocker_ap_ids),
# It's not a boost of a user that blocks you
where: