sadd user_id into GROUP_PHOTO_WATCHER_SET
Brightcells
1 gewijzigde bestanden met toevoegingen van 28 en 22 verwijderingen
+ 28
- 22
group/views.py
@@ -673,6 +673,8 @@ def comment_submit_api(request): |
||
| 673 | 673 |
# Redis 群组照片评论列表缓存刷新 |
| 674 | 674 |
set_group_photo_comment_list(photo_id) |
| 675 | 675 |
|
| 676 |
+ r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id) |
|
| 677 |
+ |
|
| 676 | 678 |
# 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒 |
| 677 | 679 |
if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id): |
| 678 | 680 |
UserMessageInfo.objects.create( |
@@ -689,17 +691,18 @@ def comment_submit_api(request): |
||
| 689 | 691 |
|
| 690 | 692 |
# 给所有关注者(评论/点赞)发送提醒 |
| 691 | 693 |
for watcher in get_group_photo_watchers(photo_id): |
| 692 |
- UserMessageInfo.objects.create( |
|
| 693 |
- from_uid=user_id, |
|
| 694 |
- from_nickname=group_user.nickname, |
|
| 695 |
- from_avatar=group_user.avatar, |
|
| 696 |
- to_uid=watcher, |
|
| 697 |
- group_id=group_photo.group_id, |
|
| 698 |
- photo_id=group_photo.pk, |
|
| 699 |
- msg_type=UserMessageInfo.COMMENT, |
|
| 700 |
- msg_title=u'评论', |
|
| 701 |
- msg_content=comment, |
|
| 702 |
- ) |
|
| 694 |
+ if watcher != user_id: |
|
| 695 |
+ UserMessageInfo.objects.create( |
|
| 696 |
+ from_uid=user_id, |
|
| 697 |
+ from_nickname=group_user.nickname, |
|
| 698 |
+ from_avatar=group_user.avatar, |
|
| 699 |
+ to_uid=watcher, |
|
| 700 |
+ group_id=group_photo.group_id, |
|
| 701 |
+ photo_id=group_photo.pk, |
|
| 702 |
+ msg_type=UserMessageInfo.COMMENT, |
|
| 703 |
+ msg_title=u'评论', |
|
| 704 |
+ msg_content=comment, |
|
| 705 |
+ ) |
|
| 703 | 706 |
|
| 704 | 707 |
return JsonResponse({
|
| 705 | 708 |
'status': 200, |
@@ -759,6 +762,8 @@ def thumbup_submit_api(request): |
||
| 759 | 762 |
# Redis 群组照片点赞列表缓存刷新 |
| 760 | 763 |
set_group_photo_thumbup_list(photo_id) |
| 761 | 764 |
|
| 765 |
+ r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id) |
|
| 766 |
+ |
|
| 762 | 767 |
# 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒 |
| 763 | 768 |
if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id): |
| 764 | 769 |
UserMessageInfo.objects.create( |
@@ -775,17 +780,18 @@ def thumbup_submit_api(request): |
||
| 775 | 780 |
|
| 776 | 781 |
# 给所有关注者(评论/点赞)发送提醒 |
| 777 | 782 |
for watcher in get_group_photo_watchers(photo_id): |
| 778 |
- UserMessageInfo.objects.create( |
|
| 779 |
- from_uid=user_id, |
|
| 780 |
- from_nickname=group_user.nickname, |
|
| 781 |
- from_avatar=group_user.avatar, |
|
| 782 |
- to_uid=watcher, |
|
| 783 |
- group_id=group_photo.group_id, |
|
| 784 |
- photo_id=group_photo.pk, |
|
| 785 |
- msg_type=UserMessageInfo.THUMBUP, |
|
| 786 |
- msg_title=u'点赞', |
|
| 787 |
- msg_content=u'点赞', |
|
| 788 |
- ) |
|
| 783 |
+ if watcher != user_id: |
|
| 784 |
+ UserMessageInfo.objects.create( |
|
| 785 |
+ from_uid=user_id, |
|
| 786 |
+ from_nickname=group_user.nickname, |
|
| 787 |
+ from_avatar=group_user.avatar, |
|
| 788 |
+ to_uid=watcher, |
|
| 789 |
+ group_id=group_photo.group_id, |
|
| 790 |
+ photo_id=group_photo.pk, |
|
| 791 |
+ msg_type=UserMessageInfo.THUMBUP, |
|
| 792 |
+ msg_title=u'点赞', |
|
| 793 |
+ msg_content=u'点赞', |
|
| 794 |
+ ) |
|
| 789 | 795 |
|
| 790 | 796 |
return JsonResponse({
|
| 791 | 797 |
'status': 200, |