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

Adding shares to river blurblog. Time to ship!

Browse source
This commit is contained in:
Samuel Clay 2012-08-09 23:33:54 -07:00
parent 0f27bff19a
commit c295c578ca
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/social/models.py
View file

@ -1369,6 +1369,8 @@ class MSharedStory(mongo.Document):
set(story['commented_by_friends'])) set(story['commented_by_friends']))
story['share_count_public'] = story['share_count'] - len(friends_with_shares) story['share_count_public'] = story['share_count'] - len(friends_with_shares)
story['share_count_friends'] = len(friends_with_shares) story['share_count_friends'] = len(friends_with_shares)
story['friend_user_ids'] = list(set(story['commented_by_friends'] + story['shared_by_friends']))
story['public_user_ids'] = list(set(story['commented_by_public'] + story['shared_by_public']))
if story.get('source_user_id'): if story.get('source_user_id'):
profile_user_ids.add(story['source_user_id']) profile_user_ids.add(story['source_user_id'])

21
apps/social/views.py
View file

@ -104,10 +104,8 @@ def load_social_stories(request, user_id, username=None):
userstories = set(us.story_id for us in userstories_db) userstories = set(us.story_id for us in userstories_db)
starred_stories = MStarredStory.objects(user_id=user.pk, starred_stories = MStarredStory.objects(user_id=user.pk,
story_feed_id__in=story_feed_ids,
story_guid__in=story_ids).only('story_guid', 'starred_date') story_guid__in=story_ids).only('story_guid', 'starred_date')
shared_stories = MSharedStory.objects(user_id=user.pk, shared_stories = MSharedStory.objects(user_id=user.pk,
story_feed_id__in=story_feed_ids,
story_guid__in=story_ids)\ story_guid__in=story_ids)\
.only('story_guid', 'shared_date', 'comments') .only('story_guid', 'shared_date', 'comments')
starred_stories = dict([(story.story_guid, story.starred_date) for story in starred_stories]) starred_stories = dict([(story.story_guid, story.starred_date) for story in starred_stories])
@ -229,19 +227,27 @@ def load_river_blurblog(request):
# Find starred stories # Find starred stories
if story_feed_ids: if story_feed_ids:
story_ids = [story['id'] for story in stories]
starred_stories = MStarredStory.objects( starred_stories = MStarredStory.objects(
user_id=user.pk, user_id=user.pk,
story_feed_id__in=story_feed_ids story_guid__in=story_ids
).only('story_guid', 'starred_date') ).only('story_guid', 'starred_date')
starred_stories = dict([(story.story_guid, story.starred_date) starred_stories = dict([(story.story_guid, story.starred_date)
for story in starred_stories]) for story in starred_stories])
story_ids = [story['id'] for story in 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))
for story in shared_stories])
userstories_db = MUserStory.objects(user_id=user.pk, userstories_db = MUserStory.objects(user_id=user.pk,
feed_id__in=story_feed_ids, feed_id__in=story_feed_ids,
story_id__in=story_ids).only('story_id') story_id__in=story_ids).only('story_id')
userstories = set(us.story_id for us in userstories_db) userstories = set(us.story_id for us in userstories_db)
else: else:
starred_stories = {} starred_stories = {}
shared_stories = {}
userstories = [] userstories = []
# Intelligence classifiers for all feeds involved # Intelligence classifiers for all feeds involved
@ -286,6 +292,13 @@ def load_river_blurblog(request):
'tags': apply_classifier_tags(classifier_tags, story), 'tags': apply_classifier_tags(classifier_tags, story),
'title': apply_classifier_titles(classifier_titles, story), 'title': apply_classifier_titles(classifier_titles, story),
} }
if story['id'] in shared_stories:
story['shared'] = True
shared_date = localtime_for_timezone(shared_stories[story['id']]['shared_date'],
user.profile.timezone)
story['shared_date'] = format_story_link_date__long(shared_date, now)
story['shared_comments'] = strip_tags(shared_stories[story['id']]['comments'])
diff = time.time() - start diff = time.time() - start
timediff = round(float(diff), 2) timediff = round(float(diff), 2)