Backport #27839 by @lunny Fix #23742 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: KN4CK3R <admin@oldschoolhack.me>tags/v1.21.0
@@ -16,6 +16,7 @@ type Package struct { | |||
Type string `json:"type"` | |||
Name string `json:"name"` | |||
Version string `json:"version"` | |||
HTMLURL string `json:"html_url"` | |||
// swagger:strfmt date-time | |||
CreatedAt time.Time `json:"created_at"` | |||
} |
@@ -35,6 +35,7 @@ func ToPackage(ctx context.Context, pd *packages.PackageDescriptor, doer *user_m | |||
Name: pd.Package.Name, | |||
Version: pd.Version.Version, | |||
CreatedAt: pd.Version.CreatedUnix.AsTime(), | |||
HTMLURL: pd.FullWebLink(), | |||
}, nil | |||
} | |||
@@ -173,6 +173,12 @@ func (d *DingtalkPayload) Release(p *api.ReleasePayload) (api.Payloader, error) | |||
return createDingtalkPayload(text, text, "view release", p.Release.HTMLURL), nil | |||
} | |||
func (d *DingtalkPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true) | |||
return createDingtalkPayload(text, text, "view package", p.Package.HTMLURL), nil | |||
} | |||
func createDingtalkPayload(title, text, singleTitle, singleURL string) *DingtalkPayload { | |||
return &DingtalkPayload{ | |||
MsgType: "actionCard", |
@@ -256,6 +256,12 @@ func (d *DiscordPayload) Release(p *api.ReleasePayload) (api.Payloader, error) { | |||
return d.createPayload(p.Sender, text, p.Release.Note, p.Release.HTMLURL, color), nil | |||
} | |||
func (d *DiscordPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, color := getPackagePayloadInfo(p, noneLinkFormatter, false) | |||
return d.createPayload(p.Sender, text, "", p.Package.HTMLURL, color), nil | |||
} | |||
// GetDiscordPayload converts a discord webhook into a DiscordPayload | |||
func GetDiscordPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) { | |||
s := new(DiscordPayload) |
@@ -16,7 +16,7 @@ import ( | |||
type ( | |||
// FeishuPayload represents | |||
FeishuPayload struct { | |||
MsgType string `json:"msg_type"` // text / post / image / share_chat / interactive | |||
MsgType string `json:"msg_type"` // text / post / image / share_chat / interactive / file /audio / media | |||
Content struct { | |||
Text string `json:"text"` | |||
} `json:"content"` | |||
@@ -175,6 +175,12 @@ func (f *FeishuPayload) Release(p *api.ReleasePayload) (api.Payloader, error) { | |||
return newFeishuTextPayload(text), nil | |||
} | |||
func (f *FeishuPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true) | |||
return newFeishuTextPayload(text), nil | |||
} | |||
// GetFeishuPayload converts a ding talk webhook into a FeishuPayload | |||
func GetFeishuPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) { | |||
return convertPayloader(new(FeishuPayload), p, event) |
@@ -293,6 +293,24 @@ func getIssueCommentPayloadInfo(p *api.IssueCommentPayload, linkFormatter linkFo | |||
return text, issueTitle, color | |||
} | |||
func getPackagePayloadInfo(p *api.PackagePayload, linkFormatter linkFormatter, withSender bool) (text string, color int) { | |||
refLink := linkFormatter(p.Package.HTMLURL, p.Package.Name+":"+p.Package.Version) | |||
switch p.Action { | |||
case api.HookPackageCreated: | |||
text = fmt.Sprintf("Package created: %s", refLink) | |||
color = greenColor | |||
case api.HookPackageDeleted: | |||
text = fmt.Sprintf("Package deleted: %s", refLink) | |||
color = redColor | |||
} | |||
if withSender { | |||
text += fmt.Sprintf(" by %s", linkFormatter(setting.AppURL+url.PathEscape(p.Sender.UserName), p.Sender.UserName)) | |||
} | |||
return text, color | |||
} | |||
// ToHook convert models.Webhook to api.Hook | |||
// This function is not part of the convert package to prevent an import cycle | |||
func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) { |
@@ -210,6 +210,21 @@ func (m *MatrixPayload) Repository(p *api.RepositoryPayload) (api.Payloader, err | |||
return getMatrixPayload(text, nil, m.MsgType), nil | |||
} | |||
func (m *MatrixPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
senderLink := MatrixLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName) | |||
repoLink := MatrixLinkFormatter(p.Repository.HTMLURL, p.Repository.FullName) | |||
var text string | |||
switch p.Action { | |||
case api.HookPackageCreated: | |||
text = fmt.Sprintf("[%s] Package published by %s", repoLink, senderLink) | |||
case api.HookPackageDeleted: | |||
text = fmt.Sprintf("[%s] Package deleted by %s", repoLink, senderLink) | |||
} | |||
return getMatrixPayload(text, nil, m.MsgType), nil | |||
} | |||
// GetMatrixPayload converts a Matrix webhook into a MatrixPayload | |||
func GetMatrixPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) { | |||
s := new(MatrixPayload) |
@@ -296,6 +296,20 @@ func (m *MSTeamsPayload) Release(p *api.ReleasePayload) (api.Payloader, error) { | |||
), nil | |||
} | |||
func (m *MSTeamsPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
title, color := getPackagePayloadInfo(p, noneLinkFormatter, false) | |||
return createMSTeamsPayload( | |||
p.Repository, | |||
p.Sender, | |||
title, | |||
"", | |||
p.Package.HTMLURL, | |||
color, | |||
&MSTeamsFact{"Package:", p.Package.Name}, | |||
), nil | |||
} | |||
// GetMSTeamsPayload converts a MSTeams webhook into a MSTeamsPayload | |||
func GetMSTeamsPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) { | |||
return convertPayloader(new(MSTeamsPayload), p, event) |
@@ -104,6 +104,10 @@ func (f *PackagistPayload) Release(_ *api.ReleasePayload) (api.Payloader, error) | |||
return nil, nil | |||
} | |||
func (f *PackagistPayload) Package(_ *api.PackagePayload) (api.Payloader, error) { | |||
return nil, nil | |||
} | |||
// GetPackagistPayload converts a packagist webhook into a PackagistPayload | |||
func GetPackagistPayload(p api.Payloader, event webhook_module.HookEventType, meta string) (api.Payloader, error) { | |||
s := new(PackagistPayload) |
@@ -22,6 +22,7 @@ type PayloadConvertor interface { | |||
Repository(*api.RepositoryPayload) (api.Payloader, error) | |||
Release(*api.ReleasePayload) (api.Payloader, error) | |||
Wiki(*api.WikiPayload) (api.Payloader, error) | |||
Package(*api.PackagePayload) (api.Payloader, error) | |||
} | |||
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. | |||
return s.Release(p.(*api.ReleasePayload)) | |||
case webhook_module.HookEventWiki: | |||
return s.Wiki(p.(*api.WikiPayload)) | |||
case webhook_module.HookEventPackage: | |||
return s.Package(p.(*api.PackagePayload)) | |||
} | |||
return s, nil | |||
} |
@@ -171,6 +171,12 @@ func (s *SlackPayload) Release(p *api.ReleasePayload) (api.Payloader, error) { | |||
return s.createPayload(text, nil), nil | |||
} | |||
func (s *SlackPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, _ := getPackagePayloadInfo(p, SlackLinkFormatter, true) | |||
return s.createPayload(text, nil), nil | |||
} | |||
// Push implements PayloadConvertor Push method | |||
func (s *SlackPayload) Push(p *api.PushPayload) (api.Payloader, error) { | |||
// n new commits |
@@ -186,6 +186,12 @@ func (t *TelegramPayload) Release(p *api.ReleasePayload) (api.Payloader, error) | |||
return createTelegramPayload(text), nil | |||
} | |||
func (t *TelegramPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, _ := getPackagePayloadInfo(p, htmlLinkFormatter, true) | |||
return createTelegramPayload(text), nil | |||
} | |||
// GetTelegramPayload converts a telegram webhook into a TelegramPayload | |||
func GetTelegramPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) { | |||
return convertPayloader(new(TelegramPayload), p, event) |
@@ -179,6 +179,12 @@ func (f *WechatworkPayload) Release(p *api.ReleasePayload) (api.Payloader, error | |||
return newWechatworkMarkdownPayload(text), nil | |||
} | |||
func (f *WechatworkPayload) Package(p *api.PackagePayload) (api.Payloader, error) { | |||
text, _ := getPackagePayloadInfo(p, noneLinkFormatter, true) | |||
return newWechatworkMarkdownPayload(text), nil | |||
} | |||
// GetWechatworkPayload GetWechatworkPayload converts a ding talk webhook into a WechatworkPayload | |||
func GetWechatworkPayload(p api.Payloader, event webhook_module.HookEventType, _ string) (api.Payloader, error) { | |||
return convertPayloader(new(WechatworkPayload), p, event) |
@@ -21039,6 +21039,10 @@ | |||
"creator": { | |||
"$ref": "#/definitions/User" | |||
}, | |||
"html_url": { | |||
"type": "string", | |||
"x-go-name": "HTMLURL" | |||
}, | |||
"id": { | |||
"type": "integer", | |||
"format": "int64", |