From 8c6c1b323d98d497ade4f5a07c9489c4349cb08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Thu, 8 Sep 2016 13:42:50 +0200 Subject: [PATCH 1/2] ListAllInRepo & Delete Issue-Comments --- models/issue_comment.go | 14 +++++++++ routers/api/v1/api.go | 7 ++++- routers/api/v1/repo/issue_comment.go | 46 ++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index f0fc22af34f49..ef79e54ce1dd5 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -375,6 +375,15 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro return comments, sess.Find(&comments) } +func getCommentsByRepoIDSince(e Engine, repoID, since int64) ([]*Comment, error) { + comments := make([]*Comment, 0, 10) + sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("created_unix") + if since > 0 { + sess.And("updated_unix >= ?", since) + } + return comments, sess.Find(&comments) +} + func getCommentsByIssueID(e Engine, issueID int64) ([]*Comment, error) { return getCommentsByIssueIDSince(e, issueID, -1) } @@ -389,6 +398,11 @@ func GetCommentsByIssueIDSince(issueID, since int64) ([]*Comment, error) { return getCommentsByIssueIDSince(x, issueID, since) } +// GetCommentsByRepoIDSince returns a list of comments for all issues in a repo since a given time point. +func GetCommentsByRepoIDSince(repoID, since int64) ([]*Comment, error) { + return getCommentsByRepoIDSince(x, repoID, since) +} + // UpdateComment updates information of comment. func UpdateComment(c *Comment) error { _, err := x.Id(c.ID).AllCols().Update(c) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index b920a2359395c..9943b97f78014 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 06c7d2b1f56da..0ebb11dd78c70 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,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) +} From d1b9b8c46f40db1a5ddcae2e3bac97941bbe6cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 1 Nov 2016 20:38:13 +0100 Subject: [PATCH 2/2] Moar data in issue-comments --- models/issue_comment.go | 51 +++++++++++++++++++++++++--- routers/api/v1/repo/issue_comment.go | 3 +- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index ef79e54ce1dd5..fc615d5346a44 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -123,14 +123,55 @@ func (c *Comment) AfterDelete() { } } +// HTMLURL formats a URL-string to the issue-comment +func (c *Comment) HTMLURL() string { + issue, err := GetIssueByID(c.IssueID) + if err != nil { // Silently dropping errors :unamused: + log.Error(4, "GetIssueByID(%d): %v", c.IssueID, err) + return "" + } + return fmt.Sprintf("%s#issuecomment-%d", issue.HTMLURL(), c.ID) +} + +// IssueURL formats a URL-string to the issue +func (c *Comment) IssueURL() string { + issue, err := GetIssueByID(c.IssueID) + if err != nil { // Silently dropping errors :unamused: + log.Error(4, "GetIssueByID(%d): %v", c.IssueID, err) + return "" + } + + if issue.IsPull { + return "" + } + return issue.HTMLURL() +} + +// PRURL formats a URL-string to the pull-request +func (c *Comment) PRURL() string { + issue, err := GetIssueByID(c.IssueID) + if err != nil { // Silently dropping errors :unamused: + log.Error(4, "GetIssueByID(%d): %v", c.IssueID, err) + return "" + } + + if !issue.IsPull { + return "" + } + return issue.HTMLURL() +} + // APIFormat converts a Comment to the api.Comment format func (c *Comment) APIFormat() *api.Comment { return &api.Comment{ - ID: c.ID, - Poster: c.Poster.APIFormat(), - Body: c.Content, - Created: c.Created, - Updated: c.Updated, + ID: c.ID, + Poster: c.Poster.APIFormat(), + HTMLURL: c.HTMLURL(), + IssueURL: c.IssueURL(), + PRURL: c.PRURL(), + Body: c.Content, + Created: c.Created, + Updated: c.Updated, } } diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 0ebb11dd78c70..1afd3e9d78fc9 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -105,6 +105,7 @@ 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 { @@ -119,7 +120,7 @@ func DeleteIssueComment(ctx *context.APIContext) { if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.IsAdmin()) { ctx.Status(403) return - } else if comment.Type != models.COMMENT_TYPE_COMMENT { + } else if comment.Type != models.CommentTypeComment { ctx.Status(204) return }