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

Show dms in the right places

Browse Source
This commit is contained in:
Mouse Reeve
2021-02-24 11:59:21 -08:00
parent bcdf2ee142
commit 2a5d4b83d8
9 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bookwyrm/views/feed.py
View File

@ -11,8 +11,7 @@ from django.views import View
from bookwyrm import forms, models
from bookwyrm.activitypub import ActivitypubResponse
from bookwyrm.settings import PAGE_LENGTH
from .helpers import get_activity_feed
from .helpers import get_user_from_username
from .helpers import get_activity_feed, get_user_from_username
from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
@ -28,15 +27,8 @@ class Feed(View):
page = 1
if tab == 'home':
activities = get_activity_feed(request.user, following_only=True)
# we only want to show private messages if they're related to books
activities = activities.exclude(
review__isnull=True,
comment__isnull=True,
quotation__isnull=True,
generatednote__isnull=True,
privacy='direct'
)
activities = get_activity_feed(
request.user, following_only=True, hide_dms=True)
elif tab == 'local':
activities = get_activity_feed(
request.user, privacy=['public', 'followers'], local_only=True)