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

Fixing highlights counts.

Browse source
This commit is contained in:
Samuel Clay 2020-07-10 18:58:01 -04:00
parent 30b047bbb4
commit c83a6ebe80
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/reader/views.py
View file

@ -907,7 +907,8 @@ def load_starred_stories(request):
if user.profile.is_premium:
mstories = MStarredStory.objects(
user_id=user.pk,
highlights__exists=True
highlights__exists=True,
__raw__={"$where": "this.highlights.length > 0"}
).order_by('%sstarred_date' % order_by)[offset:offset+limit]
stories = Feed.format_stories(mstories)
else:

8
apps/rss_feeds/models.py
View file

@ -3030,7 +3030,7 @@ class MStarredStoryCounts(mongo.Document):
total = 0
feed_total = 0
for c in counts:
if not c['tag'] and not c['feed_id']:
if not c['tag'] and not c['feed_id'] and not c['highlights']:
total = c['count']
if c['feed_id']:
feed_total += c['count']
@ -3067,7 +3067,7 @@ class MStarredStoryCounts(mongo.Document):
logging.debug(" ---> ~FBOperationError on mongo: ~SB%s" % e)
total_stories_count = MStarredStory.objects(user_id=user_id).count()
cls.objects(user_id=user_id, tag=None, feed_id=None).update_one(set__count=total_stories_count,
cls.objects(user_id=user_id, tag=None, feed_id=None, highlights=None).update_one(set__count=total_stories_count,
upsert=True)
return dict(total=total_stories_count, tags=user_tags, feeds=user_feeds, highlights=highlights)
@ -3088,7 +3088,9 @@ class MStarredStoryCounts(mongo.Document):
@classmethod
def count_highlights_for_user(cls, user_id):
highlighted_count = MStarredStory.objects(user_id=user_id, highlights__exists=True).count()
highlighted_count = MStarredStory.objects(user_id=user_id,
highlights__exists=True,
__raw__={"$where": "this.highlights.length > 0"}).count()
cls.objects(user_id=user_id,
highlights=True, slug="highlights").update_one(set__count=highlighted_count, upsert=True)