mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-12-15 04:36:34 +00:00
Merge branch 'main' into production
This commit is contained in:
commit
145ea053cb
1 changed files with 2 additions and 2 deletions
|
@ -113,7 +113,7 @@ class ActivityStream(ABC):
|
||||||
Q(id=status.user.id) # if the user is the post's author
|
Q(id=status.user.id) # if the user is the post's author
|
||||||
| Q(following=status.user) # if the user is following the author
|
| Q(following=status.user) # if the user is following the author
|
||||||
)
|
)
|
||||||
return audience
|
return audience.distinct()
|
||||||
|
|
||||||
def stream_statuses(self, user): # pylint: disable=no-self-use
|
def stream_statuses(self, user): # pylint: disable=no-self-use
|
||||||
""" given a user, what statuses should they see on this stream """
|
""" given a user, what statuses should they see on this stream """
|
||||||
|
@ -134,7 +134,7 @@ class HomeStream(ActivityStream):
|
||||||
return audience.filter(
|
return audience.filter(
|
||||||
Q(id=status.user.id) # if the user is the post's author
|
Q(id=status.user.id) # if the user is the post's author
|
||||||
| Q(following=status.user) # if the user is following the author
|
| Q(following=status.user) # if the user is following the author
|
||||||
)
|
).distinct()
|
||||||
|
|
||||||
def stream_statuses(self, user):
|
def stream_statuses(self, user):
|
||||||
return privacy_filter(
|
return privacy_filter(
|
||||||
|
|
Loading…
Reference in a new issue