From 3346cc10f857ea4403846b3f09b27e945f330ad6 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 3 May 2022 15:37:14 -0400 Subject: [PATCH] Moving back to having usersub only be used when unreads or oldest first is invoked, and that uses a subscribing archive user's cutoff dates. Otherwise, just page through in order. Probably should do this for Oldest first as well. --- apps/reader/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/reader/views.py b/apps/reader/views.py index be3b0ea16..87402bce6 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -682,7 +682,7 @@ def load_single_feed(request, feed_id): story_feed_id=feed_id ).order_by('%sstarred_date' % ('-' if order == 'newest' else ''))[offset:offset+limit] stories = Feed.format_stories(mstories) - elif usersub: + elif usersub and (read_filter == 'unread' or order == 'oldest'): stories = usersub.get_stories(order=order, read_filter=read_filter, offset=offset, limit=limit, default_cutoff_date=user.profile.unread_cutoff) else: