mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-10 17:25:35 +00:00
Code Issues Projects Releases Wiki Activity

User override in child class instead of if/else for privacy_filter

Browse source
This commit is contained in:
Mouse Reeve 2021-10-06 11:08:54 -07:00
parent 97cc129478
commit 68b6b1fbae
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/models/base_model.py
View file

@ -167,12 +167,7 @@ class BookWyrmModel(models.Model):
@classmethod @classmethod
def direct_filter(cls, queryset, viewer): def direct_filter(cls, queryset, viewer):
"""Override-able filter for "direct" privacy level""" """Override-able filter for "direct" privacy level"""
try: return queryset.exclude(~Q(user=viewer), privacy="direct")
return queryset.exclude(
~Q(Q(user=viewer) | Q(mention_users=viewer)), privacy="direct"
)
except FieldError:
return queryset.exclude(~Q(user=viewer), privacy="direct")
@receiver(models.signals.post_save) @receiver(models.signals.post_save)

7
bookwyrm/models/status.py
View file

@ -207,6 +207,13 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
if isinstance(self, (GeneratedNote, ReviewRating)): if isinstance(self, (GeneratedNote, ReviewRating)):
raise PermissionDenied() raise PermissionDenied()
@classmethod
def direct_filter(cls, queryset, viewer):
"""Override-able filter for "direct" privacy level"""
return queryset.exclude(
~Q(Q(user=viewer) | Q(mention_users=viewer)), privacy="direct"
)
class GeneratedNote(Status): class GeneratedNote(Status):
"""these are app-generated messages about user activity""" """these are app-generated messages about user activity"""