zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge branch 'main' into bookwyrm-groups

Browse source 
There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.
This commit is contained in:
Hugh Rundle 2021-10-17 06:22:04 +11:00
commit 6e5c0cc4c3
90 changed files with 2446 additions and 92814 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/models/base_model.py
View file

@ -67,16 +67,15 @@ class BookWyrmModel(models.Model):
return
# you can see the followers only posts of people you follow
if (
self.privacy == "followers"
and self.user.followers.filter(id=viewer.id).first()
if self.privacy == "followers" and (
self.user.followers.filter(id=viewer.id).first()
):
return
# you can see dms you are tagged in
if hasattr(self, "mention_users"):
if (
self.privacy == "direct"
self.privacy in ["direct", "followers"]
and self.mention_users.filter(id=viewer.id).first()
):