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

Changing interactions and activities on comment reply edits.

Browse source
This commit is contained in:
Samuel Clay 2012-05-01 18:15:58 -07:00
parent aeb7accab4
commit 9e4cea939c
2 changed files with 68 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
apps/social/models.py
View file

@ -1320,16 +1320,51 @@ class MInteraction(mongo.Document):
category='follow')
@classmethod
def new_comment_reply(cls, user_id, reply_user_id, reply_content, social_feed_id, story_id):
cls.objects.create(user_id=user_id,
with_user_id=reply_user_id,
category='comment_reply',
content=reply_content,
feed_id=social_feed_id,
content_id=story_id)
def new_comment_reply(cls, user_id, reply_user_id, reply_content, social_feed_id, story_id, original_message=None):
params = {
'user_id': user_id,
'with_user_id': reply_user_id,
'category': 'comment_reply',
'content': reply_content,
'feed_id': social_feed_id,
'content_id': story_id,
}
if original_message:
params['content'] = original_message
original = cls.objects.filter(**params).limit(1)
if original:
original = original[0]
original.content = reply_content
original.save()
else:
original_message = None
if not original_message:
cls.objects.create(**params)
@classmethod
def new_reply_reply(cls, user_id, reply_user_id, reply_content, social_feed_id, story_id):
def new_reply_reply(cls, user_id, reply_user_id, reply_content, social_feed_id, story_id, original_message=None):
params = {
'user_id': user_id,
'with_user_id': reply_user_id,
'category': 'reply_reply',
'content': reply_content,
'feed_id': social_feed_id,
'content_id': story_id,
}
if original_message:
params['content'] = original_message
original = cls.objects.filter(**params).limit(1)
if original:
original = original[0]
original.content = reply_content
original.save()
else:
original_message = None
if not original_message:
cls.objects.create(**params)
cls.objects.create(user_id=user_id,
with_user_id=reply_user_id,
category='reply_reply',
@ -1421,13 +1456,27 @@ class MActivity(mongo.Document):
category='follow')
@classmethod
def new_comment_reply(cls, user_id, comment_user_id, reply_content, story_feed_id, story_id):
cls.objects.create(user_id=user_id,
with_user_id=comment_user_id,
category='comment_reply',
content=reply_content,
feed_id=story_feed_id,
content_id=story_id)
def new_comment_reply(cls, user_id, comment_user_id, reply_content, story_feed_id, story_id, original_message=None):
params = {
'user_id': user_id,
'with_user_id': comment_user_id,
'category': 'comment_reply',
'content': reply_content,
'feed_id': story_feed_id,
'content_id': story_id,
}
if original_message:
params['content'] = original_message
original = cls.objects.filter(**params).limit(1)
if original:
original = original[0]
original.content = reply_content
original.save()
else:
original_message = None
if not original_message:
cls.objects.create(**params)
@classmethod
def new_shared_story(cls, user_id, story_title, comments, story_feed_id, story_id, share_date=None):

5
apps/social/views.py
View file

@ -264,7 +264,7 @@ def save_comment_reply(request):
story = MStory.objects(story_feed_id=feed_id, story_guid=story_id).limit(1).first()
if not story:
return {'code': -1, 'message': 'Story not found. Reload this site.'}
return {'code': -1, 'message': 'Story not found. Reload NewsBlur.'}
shared_story = MSharedStory.objects.get(user_id=comment_user_id,
story_feed_id=feed_id,
@ -304,12 +304,14 @@ def save_comment_reply(request):
MActivity.new_comment_reply(user_id=request.user.pk,
comment_user_id=comment['user_id'],
reply_content=reply_comments,
original_message=original_message,
story_feed_id=feed_id,
story_id=story_id)
if comment['user_id'] != request.user.pk:
MInteraction.new_comment_reply(user_id=comment['user_id'],
reply_user_id=request.user.pk,
reply_content=reply_comments,
original_message=original_message,
social_feed_id=comment_user_id,
story_id=story_id)
@ -318,6 +320,7 @@ def save_comment_reply(request):
MInteraction.new_reply_reply(user_id=user_id,
reply_user_id=request.user.pk,
reply_content=reply_comments,
original_message=original_message,
social_feed_id=comment_user_id,
story_id=story_id)