feat: add comment and show comments

Author: nk-akun

api/entrance.go

@@ -43,7 +43,7 @@ func AppRun() {
 		user.GET("/user/logout", guest.Logout)
 		user.GET("/user/current", guest.GetCurrentUser)
 
-		user.POST("/topic", guest.PostArticle)
+		user.POST("/topics", guest.PostArticle)
 		user.GET("/topics", guest.GetArticleList)
 		user.GET("/topics/:id", guest.GetArticleByID)
 		user.POST("/topics/like", guest.PostLikeArticle)

api/guest/articles.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
+	"github.com/nk-akun/NeighborBBS/logs"
 	"github.com/nk-akun/NeighborBBS/model"
 	"github.com/nk-akun/NeighborBBS/service"
 	"github.com/nk-akun/NeighborBBS/util"
@@ -13,6 +14,7 @@ import (
 // PostArticle is the api used to build a article
 func PostArticle(c *gin.Context) {
 	req := getReqFromContext(c).(*model.ArticleRequest)
+	logs.Logger.Info(req)
 	var err error
 	if req.UserID == 0 {
 		err = errors.New("user_id is invalid")

model/constant.go

@@ -10,4 +10,5 @@ const (
 	CTXAPIResponseSuccess = "api_response_success"
 
 	TokenExpireDays = 2
+	MAXCursorTime   = 2559090472000
 )

model/response.go

@@ -46,14 +46,13 @@ type ArticleBriefInfo struct {
 
 // ArticleResponse ...
 type ArticleResponse struct {
-	Title        string `json:"title"`
-	AuthorID     int64  `json:"user_id"`
-	AuthorName   string `json:"nick_name"`
-	AvatarURL    string `json:"avatar_url"`
-	Content      string `json:"content"`
-	CommentCount int    `json:"commnet_count"`
-	LikeCount    int    `json:"like_count"`
-	CreateTime   int64  `json:"create_time"`
+	ArticleID    int64          `json:"article_id"`
+	Title        string         `json:"title"`
+	User         *UserBriefInfo `json:"user"`
+	Content      string         `json:"content"`
+	CommentCount int            `json:"commnet_count"`
+	LikeCount    int            `json:"like_count"`
+	CreateTime   int64          `json:"create_time"`
 }
 
 // Comment

repository/comment_repo.go

@@ -25,7 +25,7 @@ func (r *commentRepository) Create(db *gorm.DB, comment *model.Comment) error {
 
 func (r *commentRepository) GetCommentsByCursorTime(db *gorm.DB, articleID int64, cursorTime int64) ([]model.Comment, error) {
 	var comments []model.Comment
-	err := db.Where("create_time < ?", cursorTime).Limit(30).Find(&comments).Error
+	err := db.Where("create_time < ?", cursorTime).Where("article_id = ?", articleID).Limit(30).Find(&comments).Error
 	if err != nil {
 		logs.Logger.Errorf("query db error:", err)
 		return nil, err

service/articles.go

@@ -39,9 +39,9 @@ func (s *articleService) GetArticleList(limit int, cursorTime int64, sortby stri
 	fields := []string{"id", "title", "create_time", "user_id", "view_count", "comment_count", "like_count"}
 	articles := repository.ArticleRepository.GetArticleFields(util.DB(), fields, cursorTime, limit, sortby, order)
 
-	briefList := BuildArticleList(articles)
+	briefList, minCursorTime := buildArticleList(articles)
 
-	resp.Cursor = cursorTime
+	resp.Cursor = minCursorTime
 	for i := range briefList {
 		if briefList[i].CreateTime < resp.Cursor {
 			resp.Cursor = briefList[i].CreateTime
@@ -63,10 +63,9 @@ func (s *articleService) GetArticleByID(id int64) (*model.ArticleResponse, error
 	}
 
 	resp := &model.ArticleResponse{
+		ArticleID:    articleInfo.ID,
 		Title:        articleInfo.Title,
-		AuthorID:     userInfo.ID,
-		AuthorName:   userInfo.Nickname,
-		AvatarURL:    userInfo.AvatarURL,
+		User:         BuildUserBriefInfo(userInfo),
 		Content:      articleInfo.Content,
 		CommentCount: articleInfo.CommentCount,
 		LikeCount:    articleInfo.LikeCount,
@@ -75,10 +74,11 @@ func (s *articleService) GetArticleByID(id int64) (*model.ArticleResponse, error
 	return resp, nil
 }
 
-// BuildArticleList ...
-func BuildArticleList(articles []model.Article) []*model.ArticleBriefInfo {
+func buildArticleList(articles []model.Article) ([]*model.ArticleBriefInfo, int64) {
+	var minCursorTime int64 = model.MAXCursorTime
 	briefList := make([]*model.ArticleBriefInfo, len(articles))
 	for i := range articles {
+		minCursorTime = util.MinInt64(minCursorTime, articles[i].CreateTime)
 		briefList[i] = new(model.ArticleBriefInfo)
 		briefList[i].ArticleID = articles[i].ID
 		briefList[i].Title = articles[i].Title
@@ -91,5 +91,5 @@ func BuildArticleList(articles []model.Article) []*model.ArticleBriefInfo {
 		briefList[i].User = BuildUserBriefInfo(user)
 	}
 
-	return briefList
+	return briefList, minCursorTime
 }

service/comments.go

@@ -43,19 +43,23 @@ func (s *commentService) GetCommentList(articleID int64, cursorTime int64) (*mod
 		return nil, errors.New("查询评论信息出错")
 	}
 
+	commentList, minCursorTime := buildCommentList(comtList)
 	resp.ArticleID = articleID
 	resp.TotalNum = len(comtList)
-	resp.Cursor = cursorTime
-	buildCommentList(comtList)
+	resp.Cursor = minCursorTime
+	resp.CommentList = commentList
 	return resp, nil
 }
 
-func buildCommentList(comtList []model.Comment) []*model.CommentInfo {
+func buildCommentList(comtList []model.Comment) ([]*model.CommentInfo, int64) {
+	var minCursorTime int64 = model.MAXCursorTime
+
 	sortComments(comtList, func(p, q *model.Comment) bool {
 		return p.ID < q.ID
 	})
 	detailedCommentList := make([]*model.CommentInfo, len(comtList))
 	for i := range comtList {
+		minCursorTime = util.MinInt64(minCursorTime, comtList[i].CreateTime)
 		userInfo, err := repository.UserRepository.GetUserByUserID(util.DB(), comtList[i].UserID)
 		if err != nil {
 			logs.Logger.Errorf("查询作者信息出错")
@@ -70,20 +74,20 @@ func buildCommentList(comtList []model.Comment) []*model.CommentInfo {
 			LikeCount:      comtList[i].LikeCount,
 			CreateTime:     comtList[i].CreateTime,
 		}
-		detailedCommentList[i].ParentComment = findParentComment(i, detailedCommentList[i].CommentID, detailedCommentList)
+		detailedCommentList[i].ParentComment = findParentComment(i, comtList[i].ParentID, detailedCommentList)
 	}
-	return detailedCommentList
+	return detailedCommentList, minCursorTime
 }
 
-func findParentComment(len int, commentID int64, detailedCommentList []*model.CommentInfo) *model.CommentInfo {
+func findParentComment(len int, parentID int64, detailedCommentList []*model.CommentInfo) *model.CommentInfo {
 	var l, r int = 0, len
 	var mid int
 	for l <= r {
 		mid = (l + r) >> 1
-		if detailedCommentList[mid].CommentID == commentID {
+		if detailedCommentList[mid].CommentID == parentID {
 			return detailedCommentList[mid]
 		}
-		if detailedCommentList[mid].CommentID > commentID {
+		if detailedCommentList[mid].CommentID > parentID {
 			r = mid - 1
 		} else {
 			l = mid + 1
@@ -110,7 +114,7 @@ func (pw commentWrapper) Less(i, j int) bool { // rewrite Less()
 	return pw.by(&pw.comments[i], &pw.comments[j])
 }
 
-// 封装成 SortPerson 方法
+// sortComments
 func sortComments(comments []model.Comment, by sortBy) {
 	sort.Sort(commentWrapper{comments, by})
 }

site/components/CommentInput.vue

@@ -18,11 +18,7 @@
       </div>
       <div class="comment-button-wrapper">
         <span>Ctrl or ⌘ + Enter</span>
-        <button
-          class="button is-small is-success"
-          @click="create"
-          v-text="btnName"
-        />
+        <button class="button is-small is-success" @click="create" v-text="btnName" />
       </div>
     </div>
     <div v-else class="comment-not-login">
@@ -83,11 +79,18 @@ export default {
       }
       this.sending = true
       try {
-        const data = await this.$axios.post('/api/comment/create', {
-          entityType: this.entityType,
-          entityId: this.entityId,
+        console.log(
+          this.$store.state.user.current.id,
+          this.entityId,
+          this.content,
+          this.quote ? this.quote.comment_id : 0
+        )
+        const data = await this.$axios.post('/api/comments', {
+          // entityType: this.entityType,
+          user_id: this.$store.state.user.current.id,
+          article_id: this.entityId,
           content: this.content,
-          quoteId: this.quote ? this.quote.commentId : '',
+          parent_id: this.quote ? this.quote.comment_id : 0,
         })
         this.$emit('created', data)
         this.content = ''

site/components/CommentList.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="comments">
-    <load-more
+    <load-more-comments
       v-if="commentsPage"
       ref="commentsLoadMore"
       v-slot="{ results }"
       :init-data="commentsPage"
-      :params="{ entityType: entityType, entityId: entityId }"
+      :params="{ entityType: entityType, article_id: entityId }"
       url="/api/comments"
     >
       <ul>
@@ -24,7 +24,10 @@
             ad-layout-key="-ht-19-1m-3j+mu"
           />
           <div class="comment-avatar">
-            <avatar :user="comment.user" size="35" />
+            <avatar
+              :user="{nickname:comment.user_nickname,username:comment.user_username,id:comment.user_id,avatar_url:comment.avatar_url}"
+              size="35"
+            />
           </div>
           <div class="comment-meta">
             <span
@@ -33,49 +36,52 @@
               itemscope
               itemtype="http://schema.org/Person"
             >
-              <a :href="'/user/' + comment.user.id" itemprop="name">{{ comment.user.nickname }}</a>
+              <a :href="'/user/' + comment.user_id" itemprop="name">{{ comment.user_nickname }}</a>
             </span>
             <span class="comment-time">
               <time
                 :datetime="
-                  comment.createTime | formatDate('yyyy-MM-ddTHH:mm:ss')
+                  comment.create_time | formatDate('yyyy-MM-ddTHH:mm:ss')
                 "
                 itemprop="datePublished"
-              >{{ comment.createTime | prettyDate }}</time>
+              >{{ comment.create_time | prettyDate }}</time>
             </span>
             <span class="comment-reply">
               <a @click="reply(comment)">回复</a>
             </span>
           </div>
           <div class="comment-content content">
-            <blockquote v-if="comment.quote" class="comment-quote">
+            <blockquote v-if="comment.parent_comment" class="comment-quote">
               <div class="comment-quote-user">
-                <avatar :user="comment.quote.user" size="20" />
-                <a class="quote-nickname">{{ comment.quote.user.nickname }}</a>
-                <span class="quote-time">{{ comment.quote.createTime | prettyDate }}</span>
+                <avatar
+                  :user="{nickname:comment.parent_comment.user_nickname,username:comment.parent_comment.user_username,id:comment.parent_comment.user_id,avatar_url:comment.parent_comment.avatar_url}"
+                  size="20"
+                />
+                <a class="quote-nickname">{{ comment.parent_comment.user_nickname }}</a>
+                <span class="quote-time">{{ comment.parent_comment.create_time | prettyDate }}</span>
               </div>
               <div
                 v-lazy-container="{ selector: 'img' }"
                 itemprop="text"
-                v-html="comment.quote.content"
+                v-html="comment.parent_comment.content"
               />
             </blockquote>
             <p v-lazy-container="{ selector: 'img' }" v-html="comment.content" />
           </div>
         </li>
       </ul>
-    </load-more>
+    </load-more-comments>
   </div>
 </template>
 
 <script>
 import Avatar from '~/components/Avatar'
-import LoadMore from '~/components/LoadMore'
+import LoadMoreComments from './LoadMoreComments.vue'
 
 export default {
   components: {
     Avatar,
-    LoadMore,
+    LoadMoreComments,
   },
   props: {
     entityType: {

site/components/CommentTextInput.vue

@@ -17,11 +17,7 @@
       </div>
       <div class="comment-button-wrapper">
         <span>Ctrl or ⌘ + Enter</span>
-        <button
-          class="button is-small is-success"
-          @click="create"
-          v-text="btnName"
-        />
+        <button class="button is-small is-success" @click="create" v-text="btnName" />
       </div>
     </div>
     <div v-else class="comment-not-login">
@@ -78,12 +74,13 @@ export default {
       }
       this.sending = true
       try {
-        const data = await this.$axios.post('/api/comment/create', {
-          contentType: 'text',
-          entityType: this.entityType,
-          entityId: this.entityId,
+        const data = await this.$axios.post('/api/comments', {
+          // contentType: 'text',
+          // entityType: this.entityType,
+          user_id: this.$store.state.user.current.id,
+          article_id: this.entityId,
           content: this.content,
-          quoteId: this.quote ? this.quote.commentId : '',
+          parent_id: this.quote ? this.quote.comment_id : 0,
         })
         this.$emit('created', data)
         this.content = ''