go-sonic · jakezhu9 · Feb 4, 2024 · Dec 1, 2023 · Dec 5, 2023
diff --git a/dal/comment.gen.go b/dal/comment.gen.go
diff --git a/handler/content/api/comment.go b/handler/content/api/comment.go
@@ -0,0 +1,26 @@
+package api
+
+import (
+	"github.com/gin-gonic/gin"
+
+	"github.com/go-sonic/sonic/service"
+	"github.com/go-sonic/sonic/util"
+)
+
+type CommentHandler struct {
+	BaseCommentService service.BaseCommentService
+}
+
+func NewCommentHandler(baseCommentService service.BaseCommentService) *CommentHandler {
+	return &CommentHandler{
+		BaseCommentService: baseCommentService,
+	}
+}
+
+func (c *CommentHandler) Like(ctx *gin.Context) (interface{}, error) {
+	commentID, err := util.ParamInt32(ctx, "commentID")
+	if err != nil {
+		return nil, err
+	}
+	return nil, c.BaseCommentService.IncreaseLike(ctx, commentID)
+}
diff --git a/handler/content/api/init.go b/handler/content/api/init.go
@@ -12,5 +12,6 @@ func init() {
 		NewSheetHandler,
 		NewOptionHandler,
 		NewPhotoHandler,
+		NewCommentHandler,
 	)
 }
diff --git a/handler/router.go b/handler/router.go
@@ -346,6 +346,8 @@ func (s *Server) RegisterRouters() {
 			contentAPIRouter.GET("/links/team_view", s.wrapHandler(s.ContentAPILinkHandler.LinkTeamVO))
 
 			contentAPIRouter.GET("/options/comment", s.wrapHandler(s.ContentAPIOptionHandler.Comment))
+
+			contentAPIRouter.POST("/comments/:commentID/likes", s.wrapHandler(s.ContentAPICommentHandler.Like))
 		}
 	}
 }

diff --git a/handler/server.go b/handler/server.go
@@ -77,6 +77,7 @@ type Server struct {
 	ContentAPISheetHandler    *api.SheetHandler
 	ContentAPIOptionHandler   *api.OptionHandler
 	ContentAPIPhotoHandler    *api.PhotoHandler
+	ContentAPICommentHandler  *api.CommentHandler
 }
 
 type ServerParams struct {
@@ -132,6 +133,7 @@ type ServerParams struct {
 	ContentAPISheetHandler    *api.SheetHandler
 	ContentAPIOptionHandler   *api.OptionHandler
 	ContentAPIPhotoHandler    *api.PhotoHandler
+	ContentAPICommentHandler  *api.CommentHandler
 }
 
 func NewServer(param ServerParams, lifecycle fx.Lifecycle) *Server {
@@ -197,6 +199,7 @@ func NewServer(param ServerParams, lifecycle fx.Lifecycle) *Server {
 		ContentAPIOptionHandler:   param.ContentAPIOptionHandler,
 		ContentSearchHandler:      param.ContentSearchHandler,
 		ContentAPIPhotoHandler:    param.ContentAPIPhotoHandler,
+		ContentAPICommentHandler:  param.ContentAPICommentHandler,
 	}
 	lifecycle.Append(fx.Hook{
 		OnStop:  httpServer.Shutdown,

diff --git a/model/dto/comment.go b/model/dto/comment.go
@@ -17,4 +17,5 @@ type Comment struct {
 	AllowNotification bool                 `json:"allowNotification"`
 	CreateTime        int64                `json:"createTime"`
 	Avatar            string               `json:"avatar"`
+	Likes             int32                `json:"likes"`
 }
diff --git a/model/entity/comment.gen.go b/model/entity/comment.gen.go
diff --git a/model/property/comment.go b/model/property/comment.go
@@ -5,7 +5,7 @@ import "reflect"
 var (
 	CommentGravatarDefault = Property{
 		KeyValue:     "comment_gravatar_default",
-		DefaultValue: "mm",
+		DefaultValue: "identicon",
 		Kind:         reflect.String,
 	}
 	CommentNewNeedCheck = Property{
@@ -40,12 +40,12 @@ var (
 	}
 	CommentInternalPluginJs = Property{
 		KeyValue:     "comment_internal_plugin_js",
-		DefaultValue: "//cdn.jsdelivr.net/npm/halo-comment@latest/dist/halo-comment.min.js",
+		DefaultValue: "https://cdn.jsdelivr.net/npm/halo-comment@latest/dist/halo-comment.min.js",
 		Kind:         reflect.String,
 	}
 	CommentGravatarSource = Property{
 		KeyValue:     "gravatar_source",
-		DefaultValue: "//gravatar.com/avatar/",
+		DefaultValue: "https://gravatar.com/avatar/",
 		Kind:         reflect.String,
 	}
 	CommentBanTime = Property{

diff --git a/model/vo/comment.go b/model/vo/comment.go
@@ -28,5 +28,6 @@ type JournalCommentWithJournal struct {
 
 type CommentWithHasChildren struct {
 	*dto.Comment
-	HasChildren bool `json:"hasChildren"`
+	HasChildren   bool  `json:"hasChildren"`
+	ChildrenCount int64 `json:"childrenCount"`
 }
diff --git a/resources/template/common/macro/global_macro.tmpl b/resources/template/common/macro/global_macro.tmpl
@@ -12,4 +12,19 @@
         <script src="{{or .options.comment_internal_plugin_js "https://cdn.jsdelivr.net/npm/halo-comment@latest/dist/halo-comment.min.js"}}"></script>
         <halo-comment id="{{.target.ID}}" type="{{.type}}"/>
     {{end}}
+{{end}}
+
+{{define "global.sonic_comment"}}
+    {{if or (eq .type "journal") (not .target.DisallowComment)}}
+        <div id="comment"></div>
+        <script src="https://cdn.staticfile.org/vue/3.3.4/vue.global.prod.js"></script>
+        <script src="{{.options.comment_internal_plugin_js}}"></script>
+        <script>
+            SonicComment.init("#comment", {
+                target: "{{.type}}s",
+                targetId: {{.target.ID}},
+                colorScheme: "light"
+            });
+        </script>
+    {{end}}
 {{end}}
diff --git a/scripts/table.sql b/scripts/table.sql
@@ -67,6 +67,7 @@ create table if not exists comment
     status             int          default 0  not null,
     top_priority       int          default 0  not null,
     user_agent         varchar(511) default '' not null,
+    likes              int          default 0 not null ,
     index comment_parent_id (parent_id),
     index comment_post_id (post_id),
     index comment_type_status (type, status)

diff --git a/service/assembler/comment_base.go b/service/assembler/comment_base.go
@@ -67,8 +67,10 @@ func (b *baseCommentAssembler) ConvertToWithHasChildren(ctx context.Context, com
 		}
 		if count, ok := countMap[commentDTO.ID]; ok && count > 0 {
 			commentWithHasChildren.HasChildren = true
+			commentWithHasChildren.ChildrenCount = count
 		} else {
 			commentWithHasChildren.HasChildren = false
+			commentWithHasChildren.ChildrenCount = 0
 		}
 		result = append(result, commentWithHasChildren)
 	}
@@ -90,6 +92,7 @@ func (b *baseCommentAssembler) ConvertToDTO(ctx context.Context, comment *entity
 		IsAdmin:           comment.IsAdmin,
 		AllowNotification: comment.AllowNotification,
 		CreateTime:        comment.CreateTime.UnixMilli(),
+		Likes:             comment.Likes,
 	}
 	avatarURL, err := b.BaseCommentService.BuildAvatarURL(ctx, comment.GravatarMd5, nil, nil)
 	if err != nil {
@@ -124,6 +127,7 @@ func (b *baseCommentAssembler) ConvertToDTOList(ctx context.Context, comments []
 			IsAdmin:           comment.IsAdmin,
 			AllowNotification: comment.AllowNotification,
 			CreateTime:        comment.CreateTime.UnixMilli(),
+			Likes:             comment.Likes,
 		}
 		avatarURL, err := b.BaseCommentService.BuildAvatarURL(ctx, comment.GravatarMd5, util.StringPtr(gravatarSource.(string)), util.StringPtr(gravatarDefault.(string)))
 		if err != nil {

diff --git a/service/comment_base.go b/service/comment_base.go
@@ -26,4 +26,5 @@ type BaseCommentService interface {
 	CountByStatusAndContentIDs(ctx context.Context, status consts.CommentStatus, contentIDs []int32) (map[int32]int64, error)
 	CountChildren(ctx context.Context, parentCommentIDs []int32) (map[int32]int64, error)
 	GetChildren(ctx context.Context, parentCommentID int32, contentID int32, commentType consts.CommentType) ([]*entity.Comment, error)
+	IncreaseLike(ctx context.Context, commentID int32) error
 }
diff --git a/service/impl/comment_base.go b/service/impl/comment_base.go
@@ -341,3 +341,15 @@ func (b *baseCommentServiceImpl) GetChildren(ctx context.Context, parentCommentI
 	}
 	return children, nil
 }
+
+func (b baseCommentServiceImpl) IncreaseLike(ctx context.Context, commentID int32) error {
+	commentDAL := dal.GetQueryByCtx(ctx).Comment
+	info, err := commentDAL.WithContext(ctx).Where(commentDAL.ID.Eq(commentID)).UpdateSimple(commentDAL.Likes.Add(1))
+	if err != nil {
+		return WrapDBErr(err)
+	}
+	if info.RowsAffected != 1 {
+		return xerr.NoType.New("increase comment like failed postID=%v", commentID).WithStatus(xerr.StatusBadRequest).WithMsg("failed to like comment")
+	}
+	return nil
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -346,6 +346,8 @@ func (s *Server) RegisterRouters() { @@
     			contentAPIRouter.GET("/links/team_view", s.wrapHandler(s.ContentAPILinkHandler.LinkTeamVO))
     			contentAPIRouter.GET("/options/comment", s.wrapHandler(s.ContentAPIOptionHandler.Comment))
+    			contentAPIRouter.POST("/comments/:commentID/likes", s.wrapHandler(s.ContentAPICommentHandler.Like))
     		}
     	}
     }
@@ Expand Down @@