issue comment api fix (#449)

* ListAllInRepo & Delete Issue-Comments

* Moar data in issue-comments

2 files changed, 53 insertions, 1 deletions

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index b920a23593..9943b97f78 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -280,12 +280,17 @@ func RegisterRoutes(m *macaron.Macaron) {
 				})
 				m.Group("/issues", func() {
 					m.Combo("").Get(repo.ListIssues).Post(bind(api.CreateIssueOption{}), repo.CreateIssue)
+					m.Group("/comments", func() {
+						m.Get("", repo.ListRepoIssueComments)
+						m.Combo("/:id").Patch(bind(api.EditIssueCommentOption{}), repo.EditIssueComment)
+					})
 					m.Group("/:index", func() {
 						m.Combo("").Get(repo.GetIssue).Patch(bind(api.EditIssueOption{}), repo.EditIssue)
 
 						m.Group("/comments", func() {
 							m.Combo("").Get(repo.ListIssueComments).Post(bind(api.CreateIssueCommentOption{}), repo.CreateIssueComment)
-							m.Combo("/:id").Patch(bind(api.EditIssueCommentOption{}), repo.EditIssueComment)
+							m.Combo("/:id").Patch(bind(api.EditIssueCommentOption{}), repo.EditIssueComment).
+								Delete(repo.DeleteIssueComment)
 						})
 
 						m.Group("/labels", func() {
diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go
index 06c7d2b1f5..1afd3e9d78 100644
--- a/routers/api/v1/repo/issue_comment.go
+++ b/routers/api/v1/repo/issue_comment.go
@@ -40,6 +40,26 @@ func ListIssueComments(ctx *context.APIContext) {
 	ctx.JSON(200, &apiComments)
 }
 
+// ListRepoIssueComments returns all issue-comments for an issue
+func ListRepoIssueComments(ctx *context.APIContext) {
+	var since time.Time
+	if len(ctx.Query("since")) > 0 {
+		since, _ = time.Parse(time.RFC3339, ctx.Query("since"))
+	}
+
+	comments, err := models.GetCommentsByRepoIDSince(ctx.Repo.Repository.ID, since.Unix())
+	if err != nil {
+		ctx.Error(500, "GetCommentsByRepoIDSince", err)
+		return
+	}
+
+	apiComments := make([]*api.Comment, len(comments))
+	for i := range comments {
+		apiComments[i] = comments[i].APIFormat()
+	}
+	ctx.JSON(200, &apiComments)
+}
+
 // CreateIssueComment create a comment for an issue
 func CreateIssueComment(ctx *context.APIContext, form api.CreateIssueCommentOption) {
 	issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
@@ -84,3 +104,30 @@ func EditIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
 	}
 	ctx.JSON(200, comment.APIFormat())
 }
+
+// DeleteIssueComment delete a comment from an issue
+func DeleteIssueComment(ctx *context.APIContext) {
+	comment, err := models.GetCommentByID(ctx.ParamsInt64(":id"))
+	if err != nil {
+		if models.IsErrCommentNotExist(err) {
+			ctx.Error(404, "GetCommentByID", err)
+		} else {
+			ctx.Error(500, "GetCommentByID", err)
+		}
+		return
+	}
+
+	if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.IsAdmin()) {
+		ctx.Status(403)
+		return
+	} else if comment.Type != models.CommentTypeComment {
+		ctx.Status(204)
+		return
+	}
+
+	if err = models.DeleteCommentByID(comment.ID); err != nil {
+		ctx.Error(500, "DeleteCommentByID", err)
+		return
+	}
+	ctx.Status(204)
+}