yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved privacy query

This commit is contained in:
Mouse Reeve 2021-10-02 16:55:15 -07:00
parent cd57161489
commit 43f0440505
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bookwyrm/views/helpers.py
View File

@ -61,8 +61,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
# exclude blocks from both directions # exclude blocks from both directions
if not viewer.is_anonymous: if not viewer.is_anonymous:
blocked = models.User.objects.filter(id__in=viewer.blocks.all()).all() queryset = queryset.exclude(Q(user__blocked_by=viewer) | Q(user__blocks=viewer))
queryset = queryset.exclude(Q(user__in=blocked) | Q(user__blocks=viewer))
# you can't see followers only or direct messages if you're not logged in # you can't see followers only or direct messages if you're not logged in
if viewer.is_anonymous: if viewer.is_anonymous:
@ -75,7 +74,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
if following_only: if following_only:
queryset = queryset.exclude( queryset = queryset.exclude(
~Q( # remove everythign except ~Q( # remove everythign except
Q(user__in=viewer.following.all()) Q(user__followers=viewer)
| Q(user=viewer) # user following | Q(user=viewer) # user following
| Q(mention_users=viewer) # is self # mentions user | Q(mention_users=viewer) # is self # mentions user
), ),