diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/comment.go | 4 | ||||
| -rw-r--r-- | routes/api/v1/repo/issue_comment.go | 14 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 16 insertions, 6 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/pkg/setting" ) -const APP_VER = "0.11.23.0625" +const APP_VER = "0.11.24.0627" func init() { setting.AppVer = APP_VER diff --git a/models/comment.go b/models/comment.go index b841c17d..b31b4a84 100644 --- a/models/comment.go +++ b/models/comment.go @@ -437,9 +437,9 @@ func getCommentsByIssueIDSince(e Engine, issueID, since int64) ([]*Comment, erro 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") + sess := e.Where("issue.repo_id = ?", repoID).Join("INNER", "issue", "issue.id = comment.issue_id", repoID).Asc("comment.created_unix") if since > 0 { - sess.And("updated_unix >= ?", since) + sess.And("comment.updated_unix >= ?", since) } if err := sess.Find(&comments); err != nil { return nil, err diff --git a/routes/api/v1/repo/issue_comment.go b/routes/api/v1/repo/issue_comment.go index 4a057d76..161ddf05 100644 --- a/routes/api/v1/repo/issue_comment.go +++ b/routes/api/v1/repo/issue_comment.go @@ -15,7 +15,12 @@ import ( func ListIssueComments(c *context.APIContext) { var since time.Time if len(c.Query("since")) > 0 { - since, _ = time.Parse(time.RFC3339, c.Query("since")) + var err error + since, err = time.Parse(time.RFC3339, c.Query("since")) + if err != nil { + c.Error(422, "", err) + return + } } // comments,err:=models.GetCommentsByIssueIDSince(, since) @@ -41,7 +46,12 @@ func ListIssueComments(c *context.APIContext) { func ListRepoIssueComments(c *context.APIContext) { var since time.Time if len(c.Query("since")) > 0 { - since, _ = time.Parse(time.RFC3339, c.Query("since")) + var err error + since, err = time.Parse(time.RFC3339, c.Query("since")) + if err != nil { + c.Error(422, "", err) + return + } } comments, err := models.GetCommentsByRepoIDSince(c.Repo.Repository.ID, since.Unix()) diff --git a/templates/.VERSION b/templates/.VERSION index d91dbf21..c7ddd5de 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.23.0625
\ No newline at end of file +0.11.24.0627
\ No newline at end of file |