public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 13:35:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing unread counts, using mark read date from original feed if possible.

Browse source
This commit is contained in:
Samuel Clay 2012-04-03 16:37:05 -07:00
parent 851d92f00c
commit 7365faa42a
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/social/models.py
View file

@ -413,6 +413,8 @@ class MSocialSubscription(mongo.Document):
if 'subscription_user_id' in kwargs:
params["subscription_user_id"] = kwargs["subscription_user_id"]
social_subs = cls.objects.filter(**params)
# for sub in social_subs:
# sub.calculate_feed_scores()
social_feeds = []
if social_subs:
social_subs = dict((s.subscription_user_id, s.to_json()) for s in social_subs)
@ -545,12 +547,14 @@ class MSocialSubscription(mongo.Document):
stories_db = MSharedStory.objects(user_id=self.subscription_user_id,
shared_date__gte=date_delta)
story_feed_ids = []
story_feed_ids = set()
story_ids = []
for s in stories_db:
story_feed_ids.append(s['story_feed_id'])
story_feed_ids.add(s['story_feed_id'])
story_ids.append(s['story_guid'])
# if not story_feed_ids: return self
story_feed_ids = list(story_feed_ids)
usersubs = UserSubscription.objects.filter(user__pk=self.user_id, feed__pk__in=story_feed_ids)
usersubs_map = dict((sub.feed_id, sub) for sub in usersubs)
# usersubs = UserSubscription.objects.filter(user__pk=user.pk, feed__pk__in=story_feed_ids)
# usersubs_map = dict((sub.feed_id, sub) for sub in usersubs)
@ -564,11 +568,15 @@ class MSocialSubscription(mongo.Document):
oldest_unread_story_date = now
unread_stories_db = []
for story in stories_db:
if (hasattr(story, 'story_guid') and
story.story_guid not in read_stories_ids):
unread_stories_db.append(story)
if story.story_date < oldest_unread_story_date:
oldest_unread_story_date = story.story_date
if getattr(story, 'story_guid', None) in read_stories_ids:
continue
feed_id = story.story_feed_id
if usersubs_map.get(feed_id) and story.story_date < usersubs_map[feed_id].mark_read_date:
continue
unread_stories_db.append(story)
if story.story_date < oldest_unread_story_date:
oldest_unread_story_date = story.story_date
stories = Feed.format_stories(unread_stories_db)
classifier_feeds = list(MClassifierFeed.objects(user_id=self.user_id, social_user_id=self.subscription_user_id))

3
apps/social/views.py
View file

@ -96,7 +96,8 @@ def load_social_stories(request, user_id, username=None):
story['read_status'] = 1
elif not usersubs_map.get(story_feed_id):
story['read_status'] = 0
# elif not story.get('read_status') and story['shared_date'] < usersubs_map[story_feed_id].mark_read_date:
elif not story.get('read_status') and story['story_date'] < usersubs_map[story_feed_id].mark_read_date:
story['read_status'] = 1
elif not story.get('read_status') and story['shared_date'] < date_delta:
story['read_status'] = 1
# elif not story.get('read_status') and socialsub and story['shared_date'] > socialsub.last_read_date: