domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Slack webhook channel name cannot be empty or just contain an hashtag (#4786)

Browse source
This commit is contained in:
Lanre Adelowo 2018-09-10 15:31:08 +01:00 • committed by techknowlogick
parent 6e03390aa8
commit be48397945
6 changed files with 69 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
routers/repo/webhook.go
View file

@ -332,8 +332,14 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) {
return
}
if form.HasInvalidChannel() {
ctx.Flash.Error(ctx.Tr("repo.settings.add_webhook.invalid_channel_name"))
ctx.Redirect(orCtx.Link + "/settings/hooks/slack/new")
return
}
meta, err := json.Marshal(&models.SlackMeta{
Channel: form.Channel,
Channel: strings.TrimSpace(form.Channel),
Username: form.Username,
IconURL: form.IconURL,
Color: form.Color,
@ -515,8 +521,14 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) {
return
}
if form.HasInvalidChannel() {
ctx.Flash.Error(ctx.Tr("repo.settings.add_webhook.invalid_channel_name"))
ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID))
return
}
meta, err := json.Marshal(&models.SlackMeta{
Channel: form.Channel,
Channel: strings.TrimSpace(form.Channel),
Username: form.Username,
IconURL: form.IconURL,
Color: form.Color,