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

Only show dms in dm page

This commit is contained in:
Mouse Reeve 2021-02-24 12:06:00 -08:00
parent 2a5d4b83d8
commit 779581c6f4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/views/feed.py
View File

@ -28,7 +28,7 @@ class Feed(View):
if tab == 'home': if tab == 'home':
activities = get_activity_feed( activities = get_activity_feed(
request.user, following_only=True, hide_dms=True) request.user, following_only=True)
elif tab == 'local': elif tab == 'local':
activities = get_activity_feed( activities = get_activity_feed(
request.user, privacy=['public', 'followers'], local_only=True) request.user, privacy=['public', 'followers'], local_only=True)

12
bookwyrm/views/helpers.py
View File

@ -115,7 +115,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
def get_activity_feed( def get_activity_feed(
user, privacy=None, local_only=False, following_only=False, user, privacy=None, local_only=False, following_only=False,
queryset=None, hide_dms=False): queryset=None):
''' get a filtered queryset of statuses ''' ''' get a filtered queryset of statuses '''
if not queryset: if not queryset:
queryset = models.Status.objects.select_subclasses() queryset = models.Status.objects.select_subclasses()
@ -127,8 +127,16 @@ def get_activity_feed(
queryset = privacy_filter( queryset = privacy_filter(
user, queryset, privacy, following_only=following_only) user, queryset, privacy, following_only=following_only)
if hide_dms: # only show dms if we only want dms
if privacy == ['direct']:
# dms are direct statuses not related to books # dms are direct statuses not related to books
queryset = queryset.filter(
review__isnull=True,
comment__isnull=True,
quotation__isnull=True,
generatednote__isnull=True,
)
else:
queryset = queryset.exclude( queryset = queryset.exclude(
review__isnull=True, review__isnull=True,
comment__isnull=True, comment__isnull=True,

1
bookwyrm/views/user.py
View File

@ -72,7 +72,6 @@ class User(View):
activities = get_activity_feed( activities = get_activity_feed(
request.user, request.user,
queryset=user.status_set.select_subclasses(), queryset=user.status_set.select_subclasses(),
hide_dms=True
) )
paginated = Paginator(activities, PAGE_LENGTH) paginated = Paginator(activities, PAGE_LENGTH)
goal = models.AnnualGoal.objects.filter( goal = models.AnnualGoal.objects.filter(