@@ -74,45 +74,20 @@ type Payloader interface {
74
74
JSONPayload () ([]byte , error )
75
75
}
76
76
77
- type PayloadAuthor struct {
78
- Name string `json:"name"`
79
- Email string `json:"email"`
80
- UserName string `json:"username"`
81
- }
82
-
83
- type PayloadCommitter struct {
77
+ type PayloadUser struct {
84
78
Name string `json:"name"`
85
79
Email string `json:"email"`
86
80
UserName string `json:"username"`
87
81
}
88
82
89
- type PayloadUser struct {
90
- UserName string `json:"login"`
91
- ID int64 `json:"id"`
92
- AvatarUrl string `json:"avatar_url"`
93
- }
94
-
83
+ // FIXME: consider use same format as API when commits API are added.
95
84
type PayloadCommit struct {
96
- ID string `json:"id"`
97
- Message string `json:"message"`
98
- URL string `json:"url"`
99
- Author * PayloadAuthor `json:"author"`
100
- Committer * PayloadCommitter `json:"committer"`
101
- Timestamp time.Time `json:"timestamp"`
102
- }
103
-
104
- type PayloadRepo struct {
105
- ID int64 `json:"id"`
106
- Name string `json:"name"`
107
- URL string `json:"url"`
108
- SSHURL string `json:"ssh_url"`
109
- CloneURL string `json:"clone_url"`
110
- Description string `json:"description"`
111
- Website string `json:"website"`
112
- Watchers int `json:"watchers"`
113
- Owner * PayloadAuthor `json:"owner"`
114
- Private bool `json:"private"`
115
- DefaultBranch string `json:"default_branch"`
85
+ ID string `json:"id"`
86
+ Message string `json:"message"`
87
+ URL string `json:"url"`
88
+ Author * PayloadUser `json:"author"`
89
+ Committer * PayloadUser `json:"committer"`
90
+ Timestamp time.Time `json:"timestamp"`
116
91
}
117
92
118
93
var (
@@ -129,11 +104,11 @@ var (
129
104
// \/ \/ \/ \/
130
105
131
106
type CreatePayload struct {
132
- Secret string `json:"secret"`
133
- Ref string `json:"ref"`
134
- RefType string `json:"ref_type"`
135
- Repo * PayloadRepo `json:"repository"`
136
- Sender * PayloadUser `json:"sender"`
107
+ Secret string `json:"secret"`
108
+ Ref string `json:"ref"`
109
+ RefType string `json:"ref_type"`
110
+ Repo * Repository `json:"repository"`
111
+ Sender * User `json:"sender"`
137
112
}
138
113
139
114
func (p * CreatePayload ) SetSecret (secret string ) {
@@ -177,11 +152,11 @@ type PushPayload struct {
177
152
Ref string `json:"ref"`
178
153
Before string `json:"before"`
179
154
After string `json:"after"`
180
- CompareUrl string `json:"compare_url"`
155
+ CompareURL string `json:"compare_url"`
181
156
Commits []* PayloadCommit `json:"commits"`
182
- Repo * PayloadRepo `json:"repository"`
183
- Pusher * PayloadAuthor `json:"pusher"`
184
- Sender * PayloadUser `json:"sender"`
157
+ Repo * Repository `json:"repository"`
158
+ Pusher * User `json:"pusher"`
159
+ Sender * User `json:"sender"`
185
160
}
186
161
187
162
func (p * PushPayload ) SetSecret (secret string ) {
0 commit comments