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

Adding MUserStory back in when reading and unreading, to maintain backwards compatibility.

Browse source
This commit is contained in:
Samuel Clay 2013-05-02 17:42:04 -07:00
parent ed017514e6
commit 670625acf6
3 changed files with 52 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/reader/models.py
View file

@ -339,6 +339,16 @@ class UserSubscription(models.Model):
logging.user(request, "~FYRead story in feed: %s" % (self.feed))
for story_id in set(story_ids):
story, _ = MStory.find_story(story_feed_id=self.feed_id, story_id=story_id)
if not story: continue
now = datetime.datetime.utcnow()
date = now if now > story.story_date else story.story_date # For handling future stories
m, _ = MUserStory.objects.get_or_create(story_id=story_id, user_id=self.user_id,
feed_id=self.feed_id, defaults={
'read_date': date,
'story': story,
'story_date': story.story_date,
})
RUserStory.mark_read(self.user_id, self.feed_id, story_id)
return data

12
apps/reader/views.py
View file

@ -27,7 +27,7 @@ from apps.analyzer.models import apply_classifier_titles, apply_classifier_feeds
from apps.analyzer.models import apply_classifier_authors, apply_classifier_tags
from apps.analyzer.models import get_classifiers_for_user, sort_classifiers_by_feed
from apps.profile.models import Profile
from apps.reader.models import UserSubscription, UserSubscriptionFolders, RUserStory, Feature
from apps.reader.models import UserSubscription, UserSubscriptionFolders, MUserStory, RUserStory, Feature
from apps.reader.forms import SignupForm, LoginForm, FeatureForm
from apps.rss_feeds.models import MFeedIcon
from apps.statistics.models import MStatistics
@ -1004,7 +1004,15 @@ def mark_story_as_unread(request):
story_guid_hash=story.guid_hash)
dirty_count = social_subs and social_subs.count()
dirty_count = ("(%s social_subs)" % dirty_count) if dirty_count else ""
try:
m = MUserStory.objects.get(user_id=request.user.pk, feed_id=feed_id, story_id=story_id)
m.delete()
except MUserStory.DoesNotExist:
if usersub and story.story_date > usersub.mark_read_date:
logging.user(request, "~SB~FRCouldn't find read story to mark as unread.")
else:
data['code'] = -1
RUserStory.mark_unread(user_id=request.user.pk, story_feed_id=feed_id, story_hash=story.story_hash)
r = redis.Redis(connection_pool=settings.REDIS_POOL)

72
apps/social/views.py
View file

@ -97,53 +97,43 @@ def load_social_stories(request, user_id, username=None):
classifier_titles = classifier_titles + list(MClassifierTitle.objects(user_id=user.pk, feed_id__in=story_feed_ids))
classifier_tags = classifier_tags + list(MClassifierTag.objects(user_id=user.pk, feed_id__in=story_feed_ids))
story_ids = [story['id'] for story in stories]
userstories_db = MUserStory.objects(user_id=user.pk,
feed_id__in=story_feed_ids,
story_id__in=story_ids).only('story_id')
userstories = set(us.story_id for us in userstories_db)
unread_story_hashes = []
if read_filter == 'all' and socialsub:
unread_story_hashes = socialsub.get_stories(read_filter='unread', limit=500)
story_hashes = [story['story_hash'] for story in stories]
starred_stories = MStarredStory.objects(user_id=user.pk,
story_guid__in=story_ids).only('story_guid', 'starred_date')
story_hash__in=story_hashes)\
.only('story_hash', 'starred_date')
shared_stories = MSharedStory.objects(user_id=user.pk,
story_guid__in=story_ids)\
.only('story_guid', 'shared_date', 'comments')
starred_stories = dict([(story.story_guid, story.starred_date) for story in starred_stories])
shared_stories = dict([(story.story_guid, dict(shared_date=story.shared_date, comments=story.comments))
story_hash__in=story_hashes)\
.only('story_hash', 'shared_date', 'comments')
starred_stories = dict([(story.story_hash, story.starred_date) for story in starred_stories])
shared_stories = dict([(story.story_hash, dict(shared_date=story.shared_date,
comments=story.comments))
for story in shared_stories])
for story in stories:
story['social_user_id'] = social_user_id
story_feed_id = story['story_feed_id']
# story_date = localtime_for_timezone(story['story_date'], user.profile.timezone)
shared_date = localtime_for_timezone(story['shared_date'], user.profile.timezone)
story['short_parsed_date'] = format_story_link_date__short(shared_date, now)
story['long_parsed_date'] = format_story_link_date__long(shared_date, now)
if not socialsub:
story['read_status'] = 1
elif story['id'] in userstories:
story['read_status'] = 1
elif story['shared_date'] < date_delta:
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:
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:
# story['read_status'] = 0
else:
story['read_status'] = 1
if read_filter == 'unread' and socialsub:
story['read_status'] = 0
elif read_filter == 'all' and socialsub:
story['read_status'] = story['story_hash'] not in unread_story_hashes
if story['id'] in starred_stories:
if story['story_hash'] in starred_stories:
story['starred'] = True
starred_date = localtime_for_timezone(starred_stories[story['id']], user.profile.timezone)
starred_date = localtime_for_timezone(starred_stories[story['story_hash']],
user.profile.timezone)
story['starred_date'] = format_story_link_date__long(starred_date, now)
if story['id'] in shared_stories:
if story['story_hash'] in shared_stories:
story['shared'] = True
story['shared_comments'] = strip_tags(shared_stories[story['id']]['comments'])
story['shared_comments'] = strip_tags(shared_stories[story['story_hash']]['comments'])
story['intelligence'] = {
'feed': apply_classifier_feeds(classifier_feeds, story['story_feed_id'],
@ -234,17 +224,18 @@ def load_river_blurblog(request):
# Find starred stories
if story_feed_ids:
story_ids = [story['id'] for story in stories]
story_hashes = [story['story_hash'] for story in stories]
starred_stories = MStarredStory.objects(
user_id=user.pk,
story_guid__in=story_ids
).only('story_guid', 'starred_date')
starred_stories = dict([(story.story_guid, story.starred_date)
story_hash__in=story_hashes
).only('story_hash', 'starred_date')
starred_stories = dict([(story.story_hash, story.starred_date)
for story in starred_stories])
shared_stories = MSharedStory.objects(user_id=user.pk,
story_guid__in=story_ids)\
.only('story_guid', 'shared_date', 'comments')
shared_stories = dict([(story.story_guid, dict(shared_date=story.shared_date, comments=story.comments))
story_hash__in=story_hashes)\
.only('story_hash', 'shared_date', 'comments')
shared_stories = dict([(story.story_hash, dict(shared_date=story.shared_date,
comments=story.comments))
for story in shared_stories])
userstories_db = MUserStory.objects(user_id=user.pk,
@ -393,7 +384,7 @@ def load_social_page(request, user_id, username=None, **kwargs):
story['shared_by_user'] = True
shared_story = MSharedStory.objects.get(user_id=user.pk,
story_feed_id=story['story_feed_id'],
story_guid=story['id'])
story_hash=story['story_hash'])
story['user_comments'] = shared_story.comments
stories = MSharedStory.attach_users_to_stories(stories, profiles)
@ -502,10 +493,11 @@ def mark_story_as_shared(request):
shared_story = MSharedStory.objects.filter(user_id=request.user.pk,
story_feed_id=feed_id,
story_guid=story_id).limit(1).first()
story_hash=story['story_hash']).limit(1).first()
if not shared_story:
story_db = {
"story_guid": story.story_guid,
"story_hash": story.story_hash,
"story_permalink": story.story_permalink,
"story_title": story.story_title,
"story_feed_id": story.story_feed_id,
@ -583,7 +575,7 @@ def mark_story_as_unshared(request):
shared_story = MSharedStory.objects(user_id=request.user.pk,
story_feed_id=feed_id,
story_guid=story_id).limit(1).first()
story_hash=story['story_hash']).limit(1).first()
if not shared_story:
return json.json_response(request, {'code': -1, 'message': 'Shared story not found.'})