From 43f0440505e1163ca35eb59de2f8b6b42b1a9a56 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 2 Oct 2021 16:55:15 -0700 Subject: [PATCH] Improved privacy query --- bookwyrm/views/helpers.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index bd31fbbc..7e469f7f 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -61,8 +61,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False): # exclude blocks from both directions if not viewer.is_anonymous: - blocked = models.User.objects.filter(id__in=viewer.blocks.all()).all() - queryset = queryset.exclude(Q(user__in=blocked) | Q(user__blocks=viewer)) + queryset = queryset.exclude(Q(user__blocked_by=viewer) | Q(user__blocks=viewer)) # you can't see followers only or direct messages if you're not logged in if viewer.is_anonymous: @@ -75,7 +74,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False): if following_only: queryset = queryset.exclude( ~Q( # remove everythign except - Q(user__in=viewer.following.all()) + Q(user__followers=viewer) | Q(user=viewer) # user following | Q(mention_users=viewer) # is self # mentions user ),