Skip to content

Commit 713652e

Browse files
GiteaBotearl-warren
GiteaBot
authored and
earl-warren
committed
Fix package webhook (go-gitea#27839) (go-gitea#27854)
Backport go-gitea#27839 by @lunny Fix go-gitea#23742 Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: KN4CK3R <[email protected]> (cherry picked from commit 2147bfd)
1 parent b4fb797 commit 713652e

14 files changed

+97
-1
lines changed

‎modules/structs/package.go

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ type Package struct {
1616
Type string `json:"type"`
1717
Name string `json:"name"`
1818
Version string `json:"version"`
19+
HTMLURL string `json:"html_url"`
1920
// swagger:strfmt date-time
2021
CreatedAt time.Time `json:"created_at"`
2122
}

‎services/convert/package.go

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func ToPackage(ctx context.Context, pd *packages.PackageDescriptor, doer *user_m
3535
Name: pd.Package.Name,
3636
Version: pd.Version.Version,
3737
CreatedAt: pd.Version.CreatedUnix.AsTime(),
38+
HTMLURL: pd.FullWebLink(),
3839
}, nil
3940
}
4041

‎services/webhook/dingtalk.go

+6
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,12 @@ func (d *DingtalkPayload) Release(p *api.ReleasePayload) (api.Payloader, error)
173173
return createDingtalkPayload(text, text, "view release", p.Release.HTMLURL), nil
174174
}
175175

176+
func (d *DingtalkPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
177+
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true)
178+
179+
return createDingtalkPayload(text, text, "view package", p.Package.HTMLURL), nil
180+
}
181+
176182
func createDingtalkPayload(title, text, singleTitle, singleURL string) *DingtalkPayload {
177183
return &DingtalkPayload{
178184
MsgType: "actionCard",

‎services/webhook/discord.go

+6
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,12 @@ func (d *DiscordPayload) Release(p *api.ReleasePayload) (api.Payloader, error) {
256256
return d.createPayload(p.Sender, text, p.Release.Note, p.Release.HTMLURL, color), nil
257257
}
258258

259+
func (d *DiscordPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
260+
text, color := getPackagePayloadInfo(p, noneLinkFormatter, false)
261+
262+
return d.createPayload(p.Sender, text, "", p.Package.HTMLURL, color), nil
263+
}
264+
259265
// GetDiscordPayload converts a discord webhook into a DiscordPayload
260266
func GetDiscordPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) {
261267
s := new(DiscordPayload)

‎services/webhook/feishu.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
type (
1717
// FeishuPayload represents
1818
FeishuPayload struct {
19-
MsgType string `json:"msg_type"` // text / post / image / share_chat / interactive
19+
MsgType string `json:"msg_type"` // text / post / image / share_chat / interactive / file /audio / media
2020
Content struct {
2121
Text string `json:"text"`
2222
} `json:"content"`
@@ -158,6 +158,12 @@ func (f *FeishuPayload) Release(p *api.ReleasePayload) (api.Payloader, error) {
158158
return newFeishuTextPayload(text), nil
159159
}
160160

161+
func (f *FeishuPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
162+
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true)
163+
164+
return newFeishuTextPayload(text), nil
165+
}
166+
161167
// GetFeishuPayload converts a ding talk webhook into a FeishuPayload
162168
func GetFeishuPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) {
163169
return convertPayloader(new(FeishuPayload), p, event)

‎services/webhook/general.go

+18
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,24 @@ func getIssueCommentPayloadInfo(p *api.IssueCommentPayload, linkFormatter linkFo
230230
return text, issueTitle, color
231231
}
232232

233+
func getPackagePayloadInfo(p *api.PackagePayload, linkFormatter linkFormatter, withSender bool) (text string, color int) {
234+
refLink := linkFormatter(p.Package.HTMLURL, p.Package.Name+":"+p.Package.Version)
235+
236+
switch p.Action {
237+
case api.HookPackageCreated:
238+
text = fmt.Sprintf("Package created: %s", refLink)
239+
color = greenColor
240+
case api.HookPackageDeleted:
241+
text = fmt.Sprintf("Package deleted: %s", refLink)
242+
color = redColor
243+
}
244+
if withSender {
245+
text += fmt.Sprintf(" by %s", linkFormatter(setting.AppURL+url.PathEscape(p.Sender.UserName), p.Sender.UserName))
246+
}
247+
248+
return text, color
249+
}
250+
233251
// ToHook convert models.Webhook to api.Hook
234252
// This function is not part of the convert package to prevent an import cycle
235253
func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) {

‎services/webhook/matrix.go

+15
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,21 @@ func (m *MatrixPayload) Repository(p *api.RepositoryPayload) (api.Payloader, err
210210
return getMatrixPayload(text, nil, m.MsgType), nil
211211
}
212212

213+
func (m *MatrixPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
214+
senderLink := MatrixLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
215+
repoLink := MatrixLinkFormatter(p.Repository.HTMLURL, p.Repository.FullName)
216+
var text string
217+
218+
switch p.Action {
219+
case api.HookPackageCreated:
220+
text = fmt.Sprintf("[%s] Package published by %s", repoLink, senderLink)
221+
case api.HookPackageDeleted:
222+
text = fmt.Sprintf("[%s] Package deleted by %s", repoLink, senderLink)
223+
}
224+
225+
return getMatrixPayload(text, nil, m.MsgType), nil
226+
}
227+
213228
// GetMatrixPayload converts a Matrix webhook into a MatrixPayload
214229
func GetMatrixPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) {
215230
s := new(MatrixPayload)

‎services/webhook/msteams.go

+14
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,20 @@ func (m *MSTeamsPayload) Release(p *api.ReleasePayload) (api.Payloader, error) {
296296
), nil
297297
}
298298

299+
func (m *MSTeamsPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
300+
title, color := getPackagePayloadInfo(p, noneLinkFormatter, false)
301+
302+
return createMSTeamsPayload(
303+
p.Repository,
304+
p.Sender,
305+
title,
306+
"",
307+
p.Package.HTMLURL,
308+
color,
309+
&MSTeamsFact{"Package:", p.Package.Name},
310+
), nil
311+
}
312+
299313
// GetMSTeamsPayload converts a MSTeams webhook into a MSTeamsPayload
300314
func GetMSTeamsPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) {
301315
return convertPayloader(new(MSTeamsPayload), p, event)

‎services/webhook/packagist.go

+4
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ func (f *PackagistPayload) Release(_ *api.ReleasePayload) (api.Payloader, error)
104104
return nil, nil
105105
}
106106

107+
func (f *PackagistPayload) Package(_ *api.PackagePayload) (api.Payloader, error) {
108+
return nil, nil
109+
}
110+
107111
// GetPackagistPayload converts a packagist webhook into a PackagistPayload
108112
func GetPackagistPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) {
109113
s := new(PackagistPayload)

‎services/webhook/payloader.go

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ type PayloadConvertor interface {
2222
Repository(*api.RepositoryPayload) (api.Payloader, error)
2323
Release(*api.ReleasePayload) (api.Payloader, error)
2424
Wiki(*api.WikiPayload) (api.Payloader, error)
25+
Package(*api.PackagePayload) (api.Payloader, error)
2526
}
2627

2728
func convertPayloader(s PayloadConvertor, p api.Payloader, event webhook_module.HookEventType) (api.Payloader, error) {
@@ -53,6 +54,8 @@ func convertPayloader(s PayloadConvertor, p api.Payloader, event webhook_module.
5354
return s.Release(p.(*api.ReleasePayload))
5455
case webhook_module.HookEventWiki:
5556
return s.Wiki(p.(*api.WikiPayload))
57+
case webhook_module.HookEventPackage:
58+
return s.Package(p.(*api.PackagePayload))
5659
}
5760
return s, nil
5861
}

‎services/webhook/slack.go

+6
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@ func (s *SlackPayload) Release(p *api.ReleasePayload) (api.Payloader, error) {
171171
return s.createPayload(text, nil), nil
172172
}
173173

174+
func (s *SlackPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
175+
text, _ := getPackagePayloadInfo(p, SlackLinkFormatter, true)
176+
177+
return s.createPayload(text, nil), nil
178+
}
179+
174180
// Push implements PayloadConvertor Push method
175181
func (s *SlackPayload) Push(p *api.PushPayload) (api.Payloader, error) {
176182
// n new commits

‎services/webhook/telegram.go

+6
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ func (t *TelegramPayload) Release(p *api.ReleasePayload) (api.Payloader, error)
186186
return createTelegramPayload(text), nil
187187
}
188188

189+
func (t *TelegramPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
190+
text, _ := getPackagePayloadInfo(p, htmlLinkFormatter, true)
191+
192+
return createTelegramPayload(text), nil
193+
}
194+
189195
// GetTelegramPayload converts a telegram webhook into a TelegramPayload
190196
func GetTelegramPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) {
191197
return convertPayloader(new(TelegramPayload), p, event)

‎services/webhook/wechatwork.go

+6
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,12 @@ func (f *WechatworkPayload) Release(p *api.ReleasePayload) (api.Payloader, error
179179
return newWechatworkMarkdownPayload(text), nil
180180
}
181181

182+
func (f *WechatworkPayload) Package(p *api.PackagePayload) (api.Payloader, error) {
183+
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true)
184+
185+
return newWechatworkMarkdownPayload(text), nil
186+
}
187+
182188
// GetWechatworkPayload GetWechatworkPayload converts a ding talk webhook into a WechatworkPayload
183189
func GetWechatworkPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) {
184190
return convertPayloader(new(WechatworkPayload), p, event)

‎templates/swagger/v1_json.tmpl

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)