Skip to content

Commit 1707f59

Browse files
jolheiserlunny
jolheiser
authored and
lunny
committed
Remove text from action-only webhooks (#9377)
* Remove text from contextual webhooks Signed-off-by: jolheiser <[email protected]> * Missed one in Telegram Signed-off-by: jolheiser <[email protected]>
1 parent 3366239 commit 1707f59

File tree

4 files changed

+0
-72
lines changed

4 files changed

+0
-72
lines changed

‎modules/webhook/dingtalk.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -139,35 +139,26 @@ func getDingtalkIssuesPayload(p *api.IssuePayload) (*DingtalkPayload, error) {
139139
text = p.Issue.Body
140140
case api.HookIssueClosed:
141141
title = fmt.Sprintf("[%s] Issue closed: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
142-
text = p.Issue.Body
143142
case api.HookIssueReOpened:
144143
title = fmt.Sprintf("[%s] Issue re-opened: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
145-
text = p.Issue.Body
146144
case api.HookIssueEdited:
147145
title = fmt.Sprintf("[%s] Issue edited: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
148146
text = p.Issue.Body
149147
case api.HookIssueAssigned:
150148
title = fmt.Sprintf("[%s] Issue assigned to %s: #%d %s", p.Repository.FullName,
151149
p.Issue.Assignee.UserName, p.Index, p.Issue.Title)
152-
text = p.Issue.Body
153150
case api.HookIssueUnassigned:
154151
title = fmt.Sprintf("[%s] Issue unassigned: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
155-
text = p.Issue.Body
156152
case api.HookIssueLabelUpdated:
157153
title = fmt.Sprintf("[%s] Issue labels updated: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
158-
text = p.Issue.Body
159154
case api.HookIssueLabelCleared:
160155
title = fmt.Sprintf("[%s] Issue labels cleared: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
161-
text = p.Issue.Body
162156
case api.HookIssueSynchronized:
163157
title = fmt.Sprintf("[%s] Issue synchronized: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
164-
text = p.Issue.Body
165158
case api.HookIssueMilestoned:
166159
title = fmt.Sprintf("[%s] Issue milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
167-
text = p.Issue.Body
168160
case api.HookIssueDemilestoned:
169161
title = fmt.Sprintf("[%s] Issue clear milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
170-
text = p.Issue.Body
171162
}
172163

173164
return &DingtalkPayload{
@@ -238,10 +229,8 @@ func getDingtalkPullRequestPayload(p *api.PullRequestPayload) (*DingtalkPayload,
238229
} else {
239230
title = fmt.Sprintf("[%s] Pull request closed: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
240231
}
241-
text = p.PullRequest.Body
242232
case api.HookIssueReOpened:
243233
title = fmt.Sprintf("[%s] Pull request re-opened: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
244-
text = p.PullRequest.Body
245234
case api.HookIssueEdited:
246235
title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
247236
text = p.PullRequest.Body
@@ -253,25 +242,18 @@ func getDingtalkPullRequestPayload(p *api.PullRequestPayload) (*DingtalkPayload,
253242
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d %s", p.Repository.FullName,
254243
strings.Join(list, ", "),
255244
p.Index, p.PullRequest.Title)
256-
text = p.PullRequest.Body
257245
case api.HookIssueUnassigned:
258246
title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
259-
text = p.PullRequest.Body
260247
case api.HookIssueLabelUpdated:
261248
title = fmt.Sprintf("[%s] Pull request labels updated: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
262-
text = p.PullRequest.Body
263249
case api.HookIssueLabelCleared:
264250
title = fmt.Sprintf("[%s] Pull request labels cleared: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
265-
text = p.PullRequest.Body
266251
case api.HookIssueSynchronized:
267252
title = fmt.Sprintf("[%s] Pull request synchronized: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
268-
text = p.PullRequest.Body
269253
case api.HookIssueMilestoned:
270254
title = fmt.Sprintf("[%s] Pull request milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
271-
text = p.PullRequest.Body
272255
case api.HookIssueDemilestoned:
273256
title = fmt.Sprintf("[%s] Pull request clear milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
274-
text = p.PullRequest.Body
275257
}
276258

277259
return &DingtalkPayload{

‎modules/webhook/discord.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ func getDiscordIssuesPayload(p *api.IssuePayload, meta *DiscordMeta) (*DiscordPa
238238
case api.HookIssueClosed:
239239
title = fmt.Sprintf("[%s] Issue closed: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
240240
color = redColor
241-
text = p.Issue.Body
242241
case api.HookIssueReOpened:
243242
title = fmt.Sprintf("[%s] Issue re-opened: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
244-
text = p.Issue.Body
245243
color = yellowColor
246244
case api.HookIssueEdited:
247245
title = fmt.Sprintf("[%s] Issue edited: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
@@ -250,31 +248,24 @@ func getDiscordIssuesPayload(p *api.IssuePayload, meta *DiscordMeta) (*DiscordPa
250248
case api.HookIssueAssigned:
251249
title = fmt.Sprintf("[%s] Issue assigned to %s: #%d %s", p.Repository.FullName,
252250
p.Issue.Assignee.UserName, p.Index, p.Issue.Title)
253-
text = p.Issue.Body
254251
color = greenColor
255252
case api.HookIssueUnassigned:
256253
title = fmt.Sprintf("[%s] Issue unassigned: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
257-
text = p.Issue.Body
258254
color = yellowColor
259255
case api.HookIssueLabelUpdated:
260256
title = fmt.Sprintf("[%s] Issue labels updated: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
261-
text = p.Issue.Body
262257
color = yellowColor
263258
case api.HookIssueLabelCleared:
264259
title = fmt.Sprintf("[%s] Issue labels cleared: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
265-
text = p.Issue.Body
266260
color = yellowColor
267261
case api.HookIssueSynchronized:
268262
title = fmt.Sprintf("[%s] Issue synchronized: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
269-
text = p.Issue.Body
270263
color = yellowColor
271264
case api.HookIssueMilestoned:
272265
title = fmt.Sprintf("[%s] Issue milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
273-
text = p.Issue.Body
274266
color = yellowColor
275267
case api.HookIssueDemilestoned:
276268
title = fmt.Sprintf("[%s] Issue clear milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
277-
text = p.Issue.Body
278269
color = yellowColor
279270
}
280271

@@ -368,10 +359,8 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta)
368359
title = fmt.Sprintf("[%s] Pull request closed: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
369360
color = redColor
370361
}
371-
text = p.PullRequest.Body
372362
case api.HookIssueReOpened:
373363
title = fmt.Sprintf("[%s] Pull request re-opened: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
374-
text = p.PullRequest.Body
375364
color = yellowColor
376365
case api.HookIssueEdited:
377366
title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
@@ -385,31 +374,24 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, meta *DiscordMeta)
385374
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d by %s", p.Repository.FullName,
386375
strings.Join(list, ", "),
387376
p.Index, p.PullRequest.Title)
388-
text = p.PullRequest.Body
389377
color = greenColor
390378
case api.HookIssueUnassigned:
391379
title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
392-
text = p.PullRequest.Body
393380
color = yellowColor
394381
case api.HookIssueLabelUpdated:
395382
title = fmt.Sprintf("[%s] Pull request labels updated: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
396-
text = p.PullRequest.Body
397383
color = yellowColor
398384
case api.HookIssueLabelCleared:
399385
title = fmt.Sprintf("[%s] Pull request labels cleared: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
400-
text = p.PullRequest.Body
401386
color = yellowColor
402387
case api.HookIssueSynchronized:
403388
title = fmt.Sprintf("[%s] Pull request synchronized: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
404-
text = p.PullRequest.Body
405389
color = yellowColor
406390
case api.HookIssueMilestoned:
407391
title = fmt.Sprintf("[%s] Pull request milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
408-
text = p.PullRequest.Body
409392
color = yellowColor
410393
case api.HookIssueDemilestoned:
411394
title = fmt.Sprintf("[%s] Pull request clear milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
412-
text = p.PullRequest.Body
413395
color = yellowColor
414396
}
415397

‎modules/webhook/msteams.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,8 @@ func getMSTeamsIssuesPayload(p *api.IssuePayload) (*MSTeamsPayload, error) {
277277
case api.HookIssueClosed:
278278
title = fmt.Sprintf("[%s] Issue closed: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
279279
color = redColor
280-
text = p.Issue.Body
281280
case api.HookIssueReOpened:
282281
title = fmt.Sprintf("[%s] Issue re-opened: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
283-
text = p.Issue.Body
284282
color = yellowColor
285283
case api.HookIssueEdited:
286284
title = fmt.Sprintf("[%s] Issue edited: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
@@ -289,31 +287,24 @@ func getMSTeamsIssuesPayload(p *api.IssuePayload) (*MSTeamsPayload, error) {
289287
case api.HookIssueAssigned:
290288
title = fmt.Sprintf("[%s] Issue assigned to %s: #%d %s", p.Repository.FullName,
291289
p.Issue.Assignee.UserName, p.Index, p.Issue.Title)
292-
text = p.Issue.Body
293290
color = greenColor
294291
case api.HookIssueUnassigned:
295292
title = fmt.Sprintf("[%s] Issue unassigned: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
296-
text = p.Issue.Body
297293
color = yellowColor
298294
case api.HookIssueLabelUpdated:
299295
title = fmt.Sprintf("[%s] Issue labels updated: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
300-
text = p.Issue.Body
301296
color = yellowColor
302297
case api.HookIssueLabelCleared:
303298
title = fmt.Sprintf("[%s] Issue labels cleared: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
304-
text = p.Issue.Body
305299
color = yellowColor
306300
case api.HookIssueSynchronized:
307301
title = fmt.Sprintf("[%s] Issue synchronized: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
308-
text = p.Issue.Body
309302
color = yellowColor
310303
case api.HookIssueMilestoned:
311304
title = fmt.Sprintf("[%s] Issue milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
312-
text = p.Issue.Body
313305
color = yellowColor
314306
case api.HookIssueDemilestoned:
315307
title = fmt.Sprintf("[%s] Issue clear milestone: #%d %s", p.Repository.FullName, p.Index, p.Issue.Title)
316-
text = p.Issue.Body
317308
color = yellowColor
318309
}
319310

@@ -447,10 +438,8 @@ func getMSTeamsPullRequestPayload(p *api.PullRequestPayload) (*MSTeamsPayload, e
447438
title = fmt.Sprintf("[%s] Pull request closed: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
448439
color = redColor
449440
}
450-
text = p.PullRequest.Body
451441
case api.HookIssueReOpened:
452442
title = fmt.Sprintf("[%s] Pull request re-opened: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
453-
text = p.PullRequest.Body
454443
color = yellowColor
455444
case api.HookIssueEdited:
456445
title = fmt.Sprintf("[%s] Pull request edited: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
@@ -464,31 +453,24 @@ func getMSTeamsPullRequestPayload(p *api.PullRequestPayload) (*MSTeamsPayload, e
464453
title = fmt.Sprintf("[%s] Pull request assigned to %s: #%d by %s", p.Repository.FullName,
465454
strings.Join(list, ", "),
466455
p.Index, p.PullRequest.Title)
467-
text = p.PullRequest.Body
468456
color = greenColor
469457
case api.HookIssueUnassigned:
470458
title = fmt.Sprintf("[%s] Pull request unassigned: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
471-
text = p.PullRequest.Body
472459
color = yellowColor
473460
case api.HookIssueLabelUpdated:
474461
title = fmt.Sprintf("[%s] Pull request labels updated: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
475-
text = p.PullRequest.Body
476462
color = yellowColor
477463
case api.HookIssueLabelCleared:
478464
title = fmt.Sprintf("[%s] Pull request labels cleared: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
479-
text = p.PullRequest.Body
480465
color = yellowColor
481466
case api.HookIssueSynchronized:
482467
title = fmt.Sprintf("[%s] Pull request synchronized: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
483-
text = p.PullRequest.Body
484468
color = yellowColor
485469
case api.HookIssueMilestoned:
486470
title = fmt.Sprintf("[%s] Pull request milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
487-
text = p.PullRequest.Body
488471
color = yellowColor
489472
case api.HookIssueDemilestoned:
490473
title = fmt.Sprintf("[%s] Pull request clear milestone: #%d %s", p.Repository.FullName, p.Index, p.PullRequest.Title)
491-
text = p.PullRequest.Body
492474
color = yellowColor
493475
}
494476

‎modules/webhook/telegram.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -135,43 +135,34 @@ func getTelegramIssuesPayload(p *api.IssuePayload) (*TelegramPayload, error) {
135135
case api.HookIssueClosed:
136136
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue closed: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
137137
p.Issue.URL, p.Index, p.Issue.Title)
138-
text = p.Issue.Body
139138
case api.HookIssueReOpened:
140139
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue re-opened: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
141140
p.Issue.URL, p.Index, p.Issue.Title)
142-
text = p.Issue.Body
143141
case api.HookIssueEdited:
144142
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue edited: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
145143
p.Issue.URL, p.Index, p.Issue.Title)
146144
text = p.Issue.Body
147145
case api.HookIssueAssigned:
148146
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue assigned to %s: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
149147
p.Issue.Assignee.UserName, p.Issue.URL, p.Index, p.Issue.Title)
150-
text = p.Issue.Body
151148
case api.HookIssueUnassigned:
152149
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue unassigned: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
153150
p.Issue.URL, p.Index, p.Issue.Title)
154-
text = p.Issue.Body
155151
case api.HookIssueLabelUpdated:
156152
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue labels updated: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
157153
p.Issue.URL, p.Index, p.Issue.Title)
158-
text = p.Issue.Body
159154
case api.HookIssueLabelCleared:
160155
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue labels cleared: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
161156
p.Issue.URL, p.Index, p.Issue.Title)
162-
text = p.Issue.Body
163157
case api.HookIssueSynchronized:
164158
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue synchronized: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
165159
p.Issue.URL, p.Index, p.Issue.Title)
166-
text = p.Issue.Body
167160
case api.HookIssueMilestoned:
168161
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue milestone: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
169162
p.Issue.URL, p.Index, p.Issue.Title)
170-
text = p.Issue.Body
171163
case api.HookIssueDemilestoned:
172164
title = fmt.Sprintf(`[<a href="%s">%s</a>] Issue clear milestone: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
173165
p.Issue.URL, p.Index, p.Issue.Title)
174-
text = p.Issue.Body
175166
}
176167

177168
return &TelegramPayload{
@@ -215,11 +206,9 @@ func getTelegramPullRequestPayload(p *api.PullRequestPayload) (*TelegramPayload,
215206
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request closed: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
216207
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
217208
}
218-
text = p.PullRequest.Body
219209
case api.HookIssueReOpened:
220210
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request re-opened: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
221211
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
222-
text = p.PullRequest.Body
223212
case api.HookIssueEdited:
224213
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request edited: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
225214
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
@@ -231,31 +220,24 @@ func getTelegramPullRequestPayload(p *api.PullRequestPayload) (*TelegramPayload,
231220
}
232221
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request assigned to %s: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
233222
list, p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
234-
text = p.PullRequest.Body
235223
case api.HookIssueUnassigned:
236224
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request unassigned: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
237225
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
238-
text = p.PullRequest.Body
239226
case api.HookIssueLabelUpdated:
240227
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request labels updated: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
241228
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
242-
text = p.PullRequest.Body
243229
case api.HookIssueLabelCleared:
244230
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request labels cleared: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
245231
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
246-
text = p.PullRequest.Body
247232
case api.HookIssueSynchronized:
248233
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request synchronized: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
249234
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
250-
text = p.PullRequest.Body
251235
case api.HookIssueMilestoned:
252236
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request milestone: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
253237
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
254-
text = p.PullRequest.Body
255238
case api.HookIssueDemilestoned:
256239
title = fmt.Sprintf(`[<a href="%s">%s</a>] Pull request clear milestone: <a href="%s">#%d %s</a>`, p.Repository.HTMLURL, p.Repository.FullName,
257240
p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title)
258-
text = p.PullRequest.Body
259241
}
260242

261243
return &TelegramPayload{

0 commit comments

Comments
 (0)