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

Merge branch 'social' into redis

Browse source 
* social:
  No longer deleting old read stories if they are more recent than days_unread.
This commit is contained in:
Samuel Clay 2012-07-17 17:44:39 -07:00
commit be3c34aa87
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/reader/models.py
View file

@ -258,7 +258,7 @@ class UserSubscription(models.Model):
self.oldest_unread_story_date = now self.oldest_unread_story_date = now
self.needs_unread_recalc = False self.needs_unread_recalc = False
MUserStory.delete_marked_as_read_stories(self.user_id, self.feed_id) MUserStory.delete_old_stories(self.user_id, self.feed_id)
self.save() self.save()
@ -556,6 +556,11 @@ class MUserStory(mongo.Document):
if not mark_read_date: if not mark_read_date:
usersub = UserSubscription.objects.get(user__pk=user_id, feed__pk=feed_id) usersub = UserSubscription.objects.get(user__pk=user_id, feed__pk=feed_id)
mark_read_date = usersub.mark_read_date mark_read_date = usersub.mark_read_date
# Next line forces only old read stories to be removed, just in case newer stories
# come in as unread because they're being shared.
mark_read_date = datetime.datetime.utcnow() - datetime.timedelta(days=settings.DAYS_OF_UNREAD)
cls.objects(user_id=user_id, feed_id=feed_id, read_date__lte=mark_read_date).delete() cls.objects(user_id=user_id, feed_id=feed_id, read_date__lte=mark_read_date).delete()
@property @property