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

Oldest first now also uses feed pager unless unread only filter included.

Browse source
This commit is contained in:
Samuel Clay 2022-05-03 15:40:10 -04:00
parent 3346cc10f8
commit 16f002fd59
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/reader/views.py
View file

@ -682,11 +682,11 @@ 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 and (read_filter == 'unread' or order == 'oldest'):
elif usersub and read_filter == 'unread':
stories = usersub.get_stories(order=order, read_filter=read_filter, offset=offset, limit=limit,
default_cutoff_date=user.profile.unread_cutoff)
else:
stories = feed.get_stories(offset, limit)
stories = feed.get_stories(offset, limit, order=order)
checkpoint1 = time.time()

7
apps/rss_feeds/models.py
View file

@ -1658,8 +1658,11 @@ class Feed(models.Model):
# print "db.stories.remove({\"story_feed_id\": %s, \"_id\": \"%s\"})" % (f, u)
def get_stories(self, offset=0, limit=25, force=False):
stories_db = MStory.objects(story_feed_id=self.pk)[offset:offset+limit]
def get_stories(self, offset=0, limit=25, order="neweat", force=False):
if order == "newest":
stories_db = MStory.objects(story_feed_id=self.pk)[offset:offset+limit]
elif order == "oldest":
stories_db = MStory.objects(story_feed_id=self.pk).order_by('story_date')[offset:offset+limit]
stories = self.format_stories(stories_db, self.pk)
return stories