repo_hook: add IssuesPayload

unknwon · unknwon · commit 559fec59f2c8 · 2017-03-09T00:00:34.000-05:00
diff --git a/gogs.go b/gogs.go
@@ -14,7 +14,7 @@ import (
 )
 
 func Version() string {
-	return "0.12.7"
+	return "0.12.8"
 }
 
 // Client represents a Gogs API client.
diff --git a/repo_hook.go b/repo_hook.go
@@ -239,6 +239,8 @@ const (
 	HOOK_ISSUE_UNASSIGNED    HookIssueAction = "unassigned"
 	HOOK_ISSUE_LABEL_UPDATED HookIssueAction = "label_updated"
 	HOOK_ISSUE_LABEL_CLEARED HookIssueAction = "label_cleared"
+	HOOK_ISSUE_MILESTONED    HookIssueAction = "milestoned"
+	HOOK_ISSUE_DEMILESTONED  HookIssueAction = "demilestoned"
 	HOOK_ISSUE_SYNCHRONIZED  HookIssueAction = "synchronized"
 )
 
@@ -251,6 +253,19 @@ type ChangesPayload struct {
 	Body  *ChangesFromPayload `json:"body,omitempty"`
 }
 
+type IssuesPayload struct {
+	Action     HookIssueAction `json:"action"`
+	Index      int64           `json:"number"`
+	Issue      *Issue          `json:"issue"`
+	Changes    *ChangesPayload `json:"changes,omitempty"`
+	Repository *Repository     `json:"repository"`
+	Sender     *User           `json:"sender"`
+}
+
+func (p *IssuesPayload) JSONPayload() ([]byte, error) {
+	return json.MarshalIndent(p, "", "  ")
+}
+
 // __________      .__  .__    __________                                     __
 // \______   \__ __|  | |  |   \______   \ ____  ________ __   ____   _______/  |_
 //  |     ___/  |  \  | |  |    |       _// __ \/ ____/  |  \_/ __ \ /  ___/\   __\
@@ -262,8 +277,8 @@ type ChangesPayload struct {
 type PullRequestPayload struct {
 	Action      HookIssueAction `json:"action"`
 	Index       int64           `json:"number"`
-	Changes     *ChangesPayload `json:"changes,omitempty"`
 	PullRequest *PullRequest    `json:"pull_request"`
+	Changes     *ChangesPayload `json:"changes,omitempty"`
 	Repository  *Repository     `json:"repository"`
 	Sender      *User           `json:"sender"`
 }
diff --git a/user.go b/user.go
@@ -18,12 +18,13 @@ type User struct {
 	AvatarUrl string `json:"avatar_url"`
 }
 
-// MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility
+// MarshalJSON implements the json.Marshaler interface for User
 func (u User) MarshalJSON() ([]byte, error) {
 	// Re-declaring User to avoid recursion
 	type shadow User
 	return json.Marshal(struct {
 		shadow
+		// LEGACY [Gogs 1.0]: remove field(s) for backward compatibility
 		CompatUserName string `json:"username"`
 	}{shadow(u), u.UserName})
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func Version() string {`
`17`		`- return "0.12.7"`
	`17`	`+ return "0.12.8"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// Client represents a Gogs API client.`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,13 @@ type User struct {`
`18`	`18`	AvatarUrl string `json:"avatar_url"`
`19`	`19`	`}`
`20`	`20`
`21`		`-// MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility`
	`21`	`+// MarshalJSON implements the json.Marshaler interface for User`
`22`	`22`	`func (u User) MarshalJSON() ([]byte, error) {`
`23`	`23`	`// Re-declaring User to avoid recursion`
`24`	`24`	`type shadow User`
`25`	`25`	`return json.Marshal(struct {`
`26`	`26`	`shadow`
	`27`	`+ // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility`
`27`	`28`	CompatUserName string `json:"username"`
`28`	`29`	`}{shadow(u), u.UserName})`
`29`	`30`	`}`