cleanup

Author: 6543

models/issue_reaction.go

@@ -257,14 +257,24 @@ func (list ReactionList) GetMoreUserCount() int {
 }
 
 // APIFormat returns Raction in api Format
-func (list ReactionList) APIFormat() api.CommentReactionList {
-	result := []*api.CommentReaction{}
+func (list ReactionList) APIFormat() []*api.CommentReaction {
+	var result []*api.CommentReaction
 	users := make(map[string][]*string)
 	counts := make(map[string]int64)
 
 	for _, r := range list {
-		users[r.Type] = append(users[r.Type], &r.User.LoginName)
-		counts[r.Type]++
+		u := r.User
+		t := r.Type
+		if t == "" {
+			_ = fmt.Errorf("Key is empty!")
+			continue
+		}
+		if u == nil {
+			_ = fmt.Errorf("Key: '" + t + "', User is Nil!")
+			continue
+		}
+		users[t] = append(users[t], &u.LoginName)
+		counts[t]++
 	}
 
 	for k, v := range users {
@@ -274,5 +284,5 @@ func (list ReactionList) APIFormat() api.CommentReactionList {
 			Count:    counts[k],
 		})
 	}
-	return api.CommentReactionList{CommentReactions: result}
+	return result
 }

modules/structs/issue_comment.go

@@ -44,8 +44,3 @@ type CommentReaction struct {
 	Users []*string `json:"users"`
 	Count int64     `json:"count"`
 }
-
-// CommentReactionList is a list of comment reactions
-type CommentReactionList struct {
-	CommentReactions []*CommentReaction `json:"comment_reactions"`
-}

routers/api/v1/api.go

@@ -662,7 +662,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 								Patch(mustNotBeArchived, bind(api.EditIssueCommentOption{}), repo.EditIssueComment).
 								Delete(repo.DeleteIssueComment)
 							m.Combo("/reactions").
-								Get(bind(api.CommentReactionList{}), repo.GetCommentReactions).
+								Get(repo.GetCommentReactions).
 								Put(reqToken(), bind(api.CommentReaction{}), repo.AddCommentReaction).
 								Delete(reqToken(), bind(api.CommentReaction{}), repo.DelCommentReaction)
 						})

routers/api/v1/repo/issue_comment.go

@@ -395,7 +395,7 @@ func deleteIssueComment(ctx *context.APIContext) {
 }
 
 //GetCommentReactions return all reactions of a specific comment
-func GetCommentReactions(ctx *context.APIContext, form api.CommentReactionList) {
+func GetCommentReactions(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/issues/comments/{id}/reactions issue issueGetCommentReactions
 	// ---
 	// summary: Return all reactions of a specific comment
@@ -534,12 +534,12 @@ func setCommentReaction(ctx *context.APIContext, form api.CommentReaction, creat
 		}
 		return
 	}
-	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, comment.IssueID)
+	issue, err := models.GetIssueByID(comment.IssueID)
 	if err != nil {
 		if models.IsErrIssueNotExist(err) {
 			ctx.NotFound()
 		} else {
-			ctx.Error(500, "GetIssueByIndex", err)
+			ctx.Error(500, "GetIssueByID", err)
 		}
 
 		return

routers/api/v1/swagger/issue.go

@@ -89,12 +89,12 @@ type swaggerIssueDeadline struct {
 // swagger:response CommentReaction
 type swaggerCommentReaction struct {
 	// in:body
-	Body api.CommentReactionList `json:"body"`
+	Body api.CommentReaction `json:"body"`
 }
 
 // CommentReactionList
 // swagger:response CommentReactionList
-type swaggerCommentReactionList struct {
+type swaggerResponseCommentReactionList struct {
 	// in:body
-	Body api.CommentReactionList `json:"body"`
+	Body []api.CommentReaction `json:"body"`
 }

templates/swagger/v1_json.tmpl

@@ -11006,7 +11006,10 @@
     "CommentReactionList": {
       "description": "CommentReactionList",
       "schema": {
-        "$ref": "#/definitions/CommentReactionList"
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/CommentReaction"
+        }
       }
     },
     "Commit": {