public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using mark_read_date in all stories read_filter by folder.

Browse source
This commit is contained in:
Samuel Clay 2013-01-10 12:48:20 -08:00
parent 34a4af939d
commit 900b1d9dea
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/reader/views.py
View file

@ -742,6 +742,12 @@ def load_river_stories__redis(request):
found_feed_ids = list(set([story['story_feed_id'] for story in stories]))
stories, user_profiles = MSharedStory.stories_with_comments_and_profiles(stories, user.pk)
feed_marked_read_dates = None
if read_filter == 'all':
feed_marked_read_dates = dict((us.feed_id, us.mark_read_date)
for us in UserSubscription.objects.filter(user=user,
feed__in=found_feed_ids).only(
'feed', 'mark_read_date'))
# Find starred stories
if found_feed_ids:
if read_filter == 'all':
@ -789,12 +795,14 @@ def load_river_stories__redis(request):
# Just need to format stories
for story in stories:
if read_filter == 'all' and story['id'] in userstories:
story['read_status'] = 1
elif story['story_date'] < UNREAD_CUTOFF:
story['read_status'] = 1
else:
story['read_status'] = 0
story['read_status'] = 0
if read_filter == 'all':
if story['id'] in userstories:
story['read_status'] = 1
elif story['story_date'] < feed_marked_read_dates[story['story_feed_id']]:
story['read_status'] = 1
elif story['story_date'] < UNREAD_CUTOFF:
story['read_status'] = 1
story_date = localtime_for_timezone(story['story_date'], user.profile.timezone)
story['short_parsed_date'] = format_story_link_date__short(story_date, now)
story['long_parsed_date'] = format_story_link_date__long(story_date, now)