From 6040e1d97e15b7fc6630a9d98dc7c488468de7f5 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 5 Dec 2013 15:10:09 -0800 Subject: [PATCH] Fixing cutoff date when retrieving stories. --- apps/reader/models.py | 4 +++- apps/reader/views.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/reader/models.py b/apps/reader/models.py index c5f729107..34c404ea8 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -169,7 +169,7 @@ class UserSubscription(models.Model): return story_hashes def get_stories(self, offset=0, limit=6, order='newest', read_filter='all', withscores=False, - hashes_only=False, cutoff_date=None): + hashes_only=False, cutoff_date=None, default_cutoff_date=None): r = redis.Redis(connection_pool=settings.REDIS_STORY_HASH_POOL) rt = redis.Redis(connection_pool=settings.REDIS_STORY_HASH_TEMP_POOL) ignore_user_stories = False @@ -207,6 +207,8 @@ class UserSubscription(models.Model): if not cutoff_date: if read_filter == "unread": cutoff_date = self.mark_read_date + elif default_cutoff_date: + cutoff_date = default_cutoff_date else: cutoff_date = datetime.datetime.now() - datetime.timedelta(days=settings.DAYS_OF_UNREAD) diff --git a/apps/reader/views.py b/apps/reader/views.py index b1153bb70..f3514948b 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -548,7 +548,7 @@ def load_single_feed(request, feed_id): message = "You must be a premium subscriber to search." elif usersub and (read_filter == 'unread' or order == 'oldest'): stories = usersub.get_stories(order=order, read_filter=read_filter, offset=offset, limit=limit, - cutoff_date=user.profile.unread_cutoff) + default_cutoff_date=user.profile.unread_cutoff) else: stories = feed.get_stories(offset, limit) @@ -1019,7 +1019,7 @@ def unread_story_hashes__old(request): unread_feed_story_hashes[feed_id] = us.get_stories(read_filter='unread', limit=500, withscores=include_timestamps, hashes_only=True, - cutoff_date=user.profile.unread_cutoff) + default_cutoff_date=user.profile.unread_cutoff) story_hash_count += len(unread_feed_story_hashes[feed_id]) logging.user(request, "~FYLoading ~FCunread story hashes~FY: ~SB%s feeds~SN (%s story hashes)" %