#2907 Add commit timestamp to webhook

diff --git a/.gopmfile b/.gopmfile
index 1aa540b3bea3c296806c6f40e27507ed2035bb6b..8d09ed963837966e273a8e653d7a092ca4a86f8f 100644 (file)
--- a/.gopmfile
+++ b/.gopmfile
@@ -19,7 +19,7 @@ github.com/go-xorm/xorm = commit:b8b1711
 github.com/gogits/chardet = commit:2404f77
 github.com/gogits/cron = commit:96040e4
 github.com/gogits/git-module = commit:18dd87d
-github.com/gogits/go-gogs-client = commit:d725743
+github.com/gogits/go-gogs-client = commit:d1020b4
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:52d9b78
 github.com/kardianos/minwinsvc = commit:cad6b2b

diff --git a/cmd/web.go b/cmd/web.go
index ea3a34d96113b6e0524d3cfb8153f6cb111379d3..f2f7279bf00ecab9fe0f4a2f463aa61414bf7866 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -88,7 +88,7 @@ func checkVersion() {
                {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
                {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
                {"github.com/gogits/git-module", git.Version, "0.3.4"},
-               {"github.com/gogits/go-gogs-client", gogs.Version, "0.10.1"},
+               {"github.com/gogits/go-gogs-client", gogs.Version, "0.10.3"},
        }
        for _, c := range checkers {
                if !version.Compare(c.Version(), c.Expected, ">=") {

diff --git a/glide.lock b/glide.lock
index 0e135ae1ae260d8a69d6b38cf9e29a490f84289f..18d1ddd66bb2104e31251a9d4e73e23da81d3aad 100644 (file)
--- a/glide.lock
+++ b/glide.lock
@@ -43,7 +43,7 @@ imports:
 - name: github.com/gogits/git-module
   version: 18dd87dc5eac9ee7076133c8363803f2192d5713
 - name: github.com/gogits/go-gogs-client
-  version: d725743594dfcd8eea25024f8456c9c103dadb1a
+  version: d1020b4da5474f7533f5b11084dcfd5536cf2e71
 - name: github.com/issue9/identicon
   version: d36b54562f4cf70c83653e13dc95c220c79ef521
 - name: github.com/jaytaylor/html2text

diff --git a/models/action.go b/models/action.go
index 081f96bb2a5044f6e0c276e57b83c57a802d399e..4f57d1b3b5d8d1eaf9777f2d300e676ce7b68307 100644 (file)
--- a/models/action.go
+++ b/models/action.go
@@ -238,6 +238,7 @@ type PushCommit struct {
        Message     string
        AuthorEmail string
        AuthorName  string
+       Timestamp   time.Time
 }
 
 type PushCommits struct {
@@ -256,21 +257,22 @@ func NewPushCommits() *PushCommits {
 
 func (pc *PushCommits) ToApiPayloadCommits(repoLink string) []*api.PayloadCommit {
        commits := make([]*api.PayloadCommit, len(pc.Commits))
-       for i, cmt := range pc.Commits {
-               author_username := ""
-               author, err := GetUserByEmail(cmt.AuthorEmail)
+       for i, commit := range pc.Commits {
+               authorUsername := ""
+               author, err := GetUserByEmail(commit.AuthorEmail)
                if err == nil {
-                       author_username = author.Name
+                       authorUsername = author.Name
                }
                commits[i] = &api.PayloadCommit{
-                       ID:      cmt.Sha1,
-                       Message: cmt.Message,
-                       URL:     fmt.Sprintf("%s/commit/%s", repoLink, cmt.Sha1),
+                       ID:      commit.Sha1,
+                       Message: commit.Message,
+                       URL:     fmt.Sprintf("%s/commit/%s", repoLink, commit.Sha1),
                        Author: &api.PayloadAuthor{
-                               Name:     cmt.AuthorName,
-                               Email:    cmt.AuthorEmail,
-                               UserName: author_username,
+                               Name:     commit.AuthorName,
+                               Email:    commit.AuthorEmail,
+                               UserName: authorUsername,
                        },
+                       Timestamp: commit.Timestamp,
                }
        }
        return commits

diff --git a/models/update.go b/models/update.go
index 14e5b28cf2ee8c43688d736d66b95deba31e4fea..9b2078c98680c81078878724c8b6d1d7e46a8081 100644 (file)
--- a/models/update.go
+++ b/models/update.go
@@ -56,10 +56,12 @@ func ListToPushCommits(l *list.List) *PushCommits {
                        actEmail = commit.Committer.Email
                }
                commits = append(commits,
-                       &PushCommit{commit.ID.String(),
-                               commit.Message(),
-                               commit.Author.Email,
-                               commit.Author.Name,
+                       &PushCommit{
+                               Sha1:        commit.ID.String(),
+                               Message:     commit.Message(),
+                               AuthorEmail: commit.Author.Email,
+                               AuthorName:  commit.Author.Name,
+                               Timestamp:   commit.Author.When,
                        })
        }
        return &PushCommits{l.Len(), commits, "", nil}