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

Cleaning up unused detritus. Ready to deploy.

Browse source
This commit is contained in:
Samuel Clay 2013-05-13 19:03:38 -07:00
parent 9a5a4f9562
commit cedc8a00db
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/social/models.py
View file

@ -10,7 +10,6 @@ import random
import requests import requests
from collections import defaultdict from collections import defaultdict
from BeautifulSoup import BeautifulSoup from BeautifulSoup import BeautifulSoup
from mongoengine.queryset import NotUniqueError
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
@ -912,8 +911,7 @@ class MSocialSubscription(mongo.Document):
logging.user(request, "~BR~FYCould not find story: %s/%s" % logging.user(request, "~BR~FYCould not find story: %s/%s" %
(self.subscription_user_id, story_id)) (self.subscription_user_id, story_id))
continue continue
now = datetime.datetime.utcnow()
date = now if now > story.story_date else story.story_date # For handling future stories
feed_id = story.story_feed_id feed_id = story.story_feed_id
RUserStory.mark_read(self.user_id, feed_id, story.story_hash) RUserStory.mark_read(self.user_id, feed_id, story.story_hash)
@ -924,13 +922,13 @@ class MSocialSubscription(mongo.Document):
if self.user_id in friends_with_shares: if self.user_id in friends_with_shares:
friends_with_shares.remove(self.user_id) friends_with_shares.remove(self.user_id)
if friends_with_shares: if friends_with_shares:
socialsubs = MSocialSubscription.objects.filter(user_id=self.user_id, socialsubs = MSocialSubscription.objects.filter(
user_id=self.user_id,
subscription_user_id__in=friends_with_shares) subscription_user_id__in=friends_with_shares)
for socialsub in socialsubs: for socialsub in socialsubs:
if not socialsub.needs_unread_recalc: if not socialsub.needs_unread_recalc:
socialsub.needs_unread_recalc = True socialsub.needs_unread_recalc = True
socialsub.save() socialsub.save()
# XXX TODO: Real-time notification, just for this user
# Also count on original subscription # Also count on original subscription
usersubs = UserSubscription.objects.filter(user=self.user_id, feed=feed_id) usersubs = UserSubscription.objects.filter(user=self.user_id, feed=feed_id)
@ -939,7 +937,7 @@ class MSocialSubscription(mongo.Document):
if not usersub.needs_unread_recalc: if not usersub.needs_unread_recalc:
usersub.needs_unread_recalc = True usersub.needs_unread_recalc = True
usersub.save() usersub.save()
# XXX TODO: Real-time notification, just for this user
return data return data
@classmethod @classmethod