From b2de3d71c567e170f12da8a92f7865df77545b1e Mon Sep 17 00:00:00 2001 From: "Kim \"BKC\" Carlbäcker" Date: Wed, 21 Dec 2016 07:21:15 +0100 Subject: More Issue-Comments API-endpoints (#3624) * ListAllInRepo & Delete Issue-Comments * Moar data in issue-comments --- routers/api/v1/api.go | 7 +++++- routers/api/v1/repo/issue_comment.go | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) (limited to 'routers/api') diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 0591cddb..78fc3f45 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -259,12 +259,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 3957600b..eaa9c0c4 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -38,6 +38,25 @@ func ListIssueComments(ctx *context.APIContext) { ctx.JSON(200, &apiComments) } +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) +} + func CreateIssueComment(ctx *context.APIContext, form api.CreateIssueCommentOption) { issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { @@ -80,3 +99,29 @@ func EditIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption) } ctx.JSON(200, comment.APIFormat()) } + +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.COMMENT_TYPE_COMMENT { + ctx.Status(204) + return + } + + if err = models.DeleteCommentByID(comment.ID); err != nil { + ctx.Error(500, "DeleteCommentByID", err) + return + } + ctx.Status(204) +} -- cgit v1.2.3