Главная Обзор Помощь
Зарегистрироваться Войти
Kodo
/
kodo
Следить 2
В избранное 0
Ответвить 0

Просмотр исходного кода
fix bug multi message for photo owner

Brightcells лет %!s(int64=9): %!d(string=назад)
Родитель
9618c6d3bd
Сommit
3c11ca7b16
2 измененных файлов с 39 добавлено и 29 удалено
Показать статистику Diff
  1. 38 28
      group/views.py
  2. 1 1
      pai2/static/pai2/js/jswe.js

+ 38 - 28
group/views.py
Просмотреть файл 

@@ -676,7 +676,8 @@ def comment_submit_api(request):
676 676 
         r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id)
677 677
678 678 
         # 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒
679 
-        if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
679 
+        # 照片所有者(评论/点赞)不给自己提醒
680 
+        if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id) and group_photo.user_id != user_id:
680 681 
             UserMessageInfo.objects.create(
681 682 
                 from_uid=user_id,
682 683 
                 from_nickname=group_user.nickname,
 
@@ -690,19 +691,23 @@ def comment_submit_api(request):
690 691 
             )
691 692
692 693 
         # 给所有关注者(评论/点赞)发送提醒
693 
-        for watcher in get_group_photo_watchers(photo_id):
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 
-                )
694 
+        watchers = get_group_photo_watchers(photo_id)
695 
+        # 从关注者中移除该(评论/点赞)者
696 
+        watchers.discard(user_id)
697 
+        # 从关注者中移除该照片所有者
698 
+        watchers.discard(group_user.user_id)
699 
+        for watcher in watchers:
700 
+            UserMessageInfo.objects.create(
701 
+                from_uid=user_id,
702 
+                from_nickname=group_user.nickname,
703 
+                from_avatar=group_user.avatar,
704 
+                to_uid=watcher,
705 
+                group_id=group_photo.group_id,
706 
+                photo_id=group_photo.pk,
707 
+                msg_type=UserMessageInfo.COMMENT,
708 
+                msg_title=u'评论',
709 
+                msg_content=comment,
710 
+            )
706 711
707 712 
     return JsonResponse({
708 713 
         'status': 200,
 
@@ -765,7 +770,8 @@ def thumbup_submit_api(request):
765 770 
     r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id)
766 771
767 772 
     # 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒
768 
-    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
773 
+    # 照片所有者(评论/点赞)不给自己提醒
774 
+    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id) and group_photo.user_id != user_id:
769 775 
         UserMessageInfo.objects.create(
770 776 
             from_uid=user_id,
771 777 
             from_nickname=group_user.nickname,
 
@@ -779,19 +785,23 @@ def thumbup_submit_api(request):
779 785 
         )
780 786
781 787 
     # 给所有关注者(评论/点赞)发送提醒
782 
-    for watcher in get_group_photo_watchers(photo_id):
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 
-            )
788 
+    watchers = get_group_photo_watchers(photo_id)
789 
+    # 从关注者中移除该(评论/点赞)者
790 
+    watchers.discard(user_id)
791 
+    # 从关注者中移除该照片所有者
792 
+    watchers.discard(group_user.user_id)
793 
+    for watcher in watchers:
794 
+        UserMessageInfo.objects.create(
795 
+            from_uid=user_id,
796 
+            from_nickname=group_user.nickname,
797 
+            from_avatar=group_user.avatar,
798 
+            to_uid=watcher,
799 
+            group_id=group_photo.group_id,
800 
+            photo_id=group_photo.pk,
801 
+            msg_type=UserMessageInfo.THUMBUP,
802 
+            msg_title=u'点赞',
803 
+            msg_content=u'点赞',
804 
+        )
795 805
796 806 
     return JsonResponse({
797 807 
         'status': 200,

+ 1 - 1
pai2/static/pai2/js/jswe.js
Просмотреть файл 

@@ -1,6 +1,6 @@
1 1 
 !(function(e, t) {
2 2 
     var config = {
3 
-        wxconfig: 'http://api.pai.ai/wx/jsapi_signature',
3 
+        wxconfig: 'http://api.pai.ai/wx/jsapi_signature'
4 4 
     }, wxData = {
5 5 
         debug: false,
6 6 
         imgUrl: '',