s-num lines-num-new">
-        for watcher in watchers:
412
-            UserMessageInfo.objects.create(
413
-                from_uid=user_id,
414
-                from_nickname=group_user.nickname,
415
-                from_avatar=group_user.avatar,
416
-                to_uid=watcher,
417
-                group_id=group_photo.group_id,
418
-                photo_id=group_photo.photo_id,
419
-                msg_type=UserMessageInfo.COMMENT,
420
-                msg_title=u'评论',
421
-                msg_content=comment,
422
-            )
412
+    # 给所有关注者(评论/点赞)发送提醒,移除(评论/点赞)者和照片所有者
413
+    watchers = get_group_photo_watchers(photo_id, [user_id, group_photo.user_id])
414
+    for watcher in watchers:
415
+        UserMessageInfo.objects.create(
416
+            from_uid=user_id,
417
+            from_nickname=group_user.nickname,
418
+            from_avatar=group_user.avatar,
419
+            to_uid=watcher,
420
+            group_id=group_photo.group_id,
421
+            photo_id=group_photo.photo_id,
422
+            msg_type=UserMessageInfo.COMMENT,
423
+            msg_title=u'评论',
424
+            msg_content=comment,
425
+        )
423 426
 
424 427
     return response(200, 'Comment Success', u'评论成功', {
425 428
         'comments': get_group_photo_comment_list(photo_id),
@@ -427,6 +430,20 @@ def comment_submit_api(request):
427 430
 
428 431
 
429 432
 @logit
433
+def comment_list_api(request):
434
+    """ 飞图评论列表 """
435
+    photo_id = request.POST.get('photo_id', '')
436
+
437
+    # 群组照片校验
438
+    if not GroupPhotoInfo.objects.filter(photo_id=photo_id).exists():
439
+        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
440
+
441
+    return response(200, 'Get Comment List Success', u'获取评论列表成功', {
442
+        'comments': get_group_photo_comment_list(photo_id),
443
+    })
444
+
445
+
446
+@logit
430 447
 def thumbup_submit_api(request):
431 448
     """ 飞图点赞提交 """
432 449
     group_id = request.POST.get('group_id', '')
@@ -512,7 +529,6 @@ def thumbup_submit_api(request):
512 529
 @logit
513 530
 def thumbup_list_api(request):
514 531
     """ 飞图点赞列表 """
515
-    group_id = request.POST.get('group_id', '')
516 532
     user_id = request.POST.get('user_id', '')
517 533
     photo_id = request.POST.get('photo_id', '')
518 534
 

+ 2 - 0
utils/error/errno_utils.py

@@ -85,6 +85,8 @@ class GroupPhotoStatusCode(BaseStatusCode):
85 85
     # 点赞
86 86
     THUMB_UP_NOT_FOUND = StatusCodeField(402220, 'Thumb Up Not Found', description=u'未点赞')
87 87
     DUPLICATE_THUMB_UP = StatusCodeField(402221, 'Duplicate Thumb Up', description=u'重复点赞')
88
+    # 评论
89
+    COMMENT_CONTENT_EMPTY = StatusCodeField(402230, 'Comment Content Empty', description=u'评论内容为空')
88 90
 
89 91
 
90 92
 class OrderStatusCode(BaseStatusCode):

kodo - Gogs: Go Git Service

Няма описание

Brightcells: feebb32686 Add pc website преди 9 години
..
layout.css feebb32686 Add pc website преди 9 години