From 56da256853001cf3538b8d4ae99798e084935a90 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 18 Apr 2019 22:45:02 -0400 Subject: [PATCH] Telegram webhook (#4227) --- models/webhook.go | 18 + models/webhook_telegram.go | 322 ++++++++++++++++++ models/webhook_test.go | 3 + modules/auth/repo_form.go | 12 + modules/setting/webhook.go | 2 +- options/locale/locale_en-US.ini | 3 + public/img/telegram.png | Bin 0 -> 12399 bytes routers/repo/webhook.go | 91 +++++ routers/routes/routes.go | 4 + templates/org/settings/hook_new.tmpl | 3 + templates/repo/settings/webhook/list.tmpl | 3 + templates/repo/settings/webhook/new.tmpl | 3 + templates/repo/settings/webhook/telegram.tmpl | 15 + 13 files changed, 478 insertions(+), 1 deletion(-) create mode 100644 models/webhook_telegram.go create mode 100644 public/img/telegram.png create mode 100644 templates/repo/settings/webhook/telegram.tmpl diff --git a/models/webhook.go b/models/webhook.go index eb22e95975..8db281a15c 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -145,6 +145,15 @@ func (w *Webhook) GetDiscordHook() *DiscordMeta { return s } +// GetTelegramHook returns telegram metadata +func (w *Webhook) GetTelegramHook() *TelegramMeta { + s := &TelegramMeta{} + if err := json.Unmarshal([]byte(w.Meta), s); err != nil { + log.Error("webhook.GetTelegramHook(%d): %v", w.ID, err) + } + return s +} + // History returns history of webhook by given conditions. func (w *Webhook) History(page int) ([]*HookTask, error) { return HookTasks(w.ID, page) @@ -456,6 +465,7 @@ const ( GITEA DISCORD DINGTALK + TELEGRAM ) var hookTaskTypes = map[string]HookTaskType{ @@ -464,6 +474,7 @@ var hookTaskTypes = map[string]HookTaskType{ "slack": SLACK, "discord": DISCORD, "dingtalk": DINGTALK, + "telegram": TELEGRAM, } // ToHookTaskType returns HookTaskType by given name. @@ -484,6 +495,8 @@ func (t HookTaskType) Name() string { return "discord" case DINGTALK: return "dingtalk" + case TELEGRAM: + return "telegram" } return "" } @@ -657,6 +670,11 @@ func prepareWebhook(e Engine, w *Webhook, repo *Repository, event HookEventType, if err != nil { return fmt.Errorf("GetDingtalkPayload: %v", err) } + case TELEGRAM: + payloader, err = GetTelegramPayload(p, event, w.Meta) + if err != nil { + return fmt.Errorf("GetTelegramPayload: %v", err) + } default: p.SetSecret(w.Secret) payloader = p diff --git a/models/webhook_telegram.go b/models/webhook_telegram.go new file mode 100644 index 0000000000..5680c48b85 --- /dev/null +++ b/models/webhook_telegram.go @@ -0,0 +1,322 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "encoding/json" + "fmt" + "strings" + + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/markup" + api "code.gitea.io/sdk/gitea" +) + +type ( + // TelegramPayload represents + TelegramPayload struct { + Message string `json:"text"` + ParseMode string `json:"parse_mode"` + } + + // TelegramMeta contains the telegram metadata + TelegramMeta struct { + BotToken string `json:"bot_token"` + ChatID string `json:"chat_id"` + } +) + +// SetSecret sets the telegram secret +func (p *TelegramPayload) SetSecret(_ string) {} + +// JSONPayload Marshals the TelegramPayload to json +func (p *TelegramPayload) JSONPayload() ([]byte, error) { + p.ParseMode = "HTML" + p.Message = markup.Sanitize(p.Message) + data, err := json.MarshalIndent(p, "", " ") + if err != nil { + return []byte{}, err + } + return data, nil +} + +func getTelegramCreatePayload(p *api.CreatePayload) (*TelegramPayload, error) { + // created tag/branch + refName := git.RefEndName(p.Ref) + title := fmt.Sprintf(`[%s] %s %s created`, p.Repo.HTMLURL, p.Repo.FullName, p.RefType, + p.Repo.HTMLURL+"/src/"+refName, refName) + + return &TelegramPayload{ + Message: title, + }, nil +} + +func getTelegramDeletePayload(p *api.DeletePayload) (*TelegramPayload, error) { + // created tag/branch + refName := git.RefEndName(p.Ref) + title := fmt.Sprintf(`[%s] %s %s deleted`, p.Repo.HTMLURL, p.Repo.FullName, p.RefType, + p.Repo.HTMLURL+"/src/"+refName, refName) + + return &TelegramPayload{ + Message: title, + }, nil +} + +func getTelegramForkPayload(p *api.ForkPayload) (*TelegramPayload, error) { + title := fmt.Sprintf(`%s is forked to %s`, p.Forkee.FullName, p.Repo.HTMLURL, p.Repo.FullName) + + return &TelegramPayload{ + Message: title, + }, nil +} + +func getTelegramPushPayload(p *api.PushPayload) (*TelegramPayload, error) { + var ( + branchName = git.RefEndName(p.Ref) + commitDesc string + ) + + var titleLink string + if len(p.Commits) == 1 { + commitDesc = "1 new commit" + titleLink = p.Commits[0].URL + } else { + commitDesc = fmt.Sprintf("%d new commits", len(p.Commits)) + titleLink = p.CompareURL + } + if titleLink == "" { + titleLink = p.Repo.HTMLURL + "/src/" + branchName + } + title := fmt.Sprintf(`[%s:%s] %s`, p.Repo.HTMLURL, p.Repo.FullName, titleLink, branchName, commitDesc) + + var text string + // for each commit, generate attachment text + for i, commit := range p.Commits { + var authorName string + if commit.Author != nil { + authorName = " - " + commit.Author.Name + } + text += fmt.Sprintf(`[%s] %s`, commit.URL, commit.ID[:7], + strings.TrimRight(commit.Message, "\r\n")) + authorName + // add linebreak to each commit but the last + if i < len(p.Commits)-1 { + text += "\n" + } + } + + return &TelegramPayload{ + Message: title + "\n" + text, + }, nil +} + +func getTelegramIssuesPayload(p *api.IssuePayload) (*TelegramPayload, error) { + var text, title string + switch p.Action { + case api.HookIssueOpened: + title = fmt.Sprintf(`[%s] Issue opened: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueClosed: + title = fmt.Sprintf(`[%s] Issue closed: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueReOpened: + title = fmt.Sprintf(`[%s] Issue re-opened: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueEdited: + title = fmt.Sprintf(`[%s] Issue edited: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueAssigned: + title = fmt.Sprintf(`[%s] Issue assigned to %s: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.Assignee.UserName, p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueUnassigned: + title = fmt.Sprintf(`[%s] Issue unassigned: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueLabelUpdated: + title = fmt.Sprintf(`[%s] Issue labels updated: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueLabelCleared: + title = fmt.Sprintf(`[%s] Issue labels cleared: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueSynchronized: + title = fmt.Sprintf(`[%s] Issue synchronized: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueMilestoned: + title = fmt.Sprintf(`[%s] Issue milestone: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + case api.HookIssueDemilestoned: + title = fmt.Sprintf(`[%s] Issue clear milestone: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.Issue.URL, p.Index, p.Issue.Title) + text = p.Issue.Body + } + + return &TelegramPayload{ + Message: title + "\n\n" + text, + }, nil +} + +func getTelegramIssueCommentPayload(p *api.IssueCommentPayload) (*TelegramPayload, error) { + url := fmt.Sprintf("%s/issues/%d#%s", p.Repository.HTMLURL, p.Issue.Index, CommentHashTag(p.Comment.ID)) + title := fmt.Sprintf(`#%d %s`, url, p.Issue.Index, p.Issue.Title) + var text string + switch p.Action { + case api.HookIssueCommentCreated: + text = "New comment: " + title + text += p.Comment.Body + case api.HookIssueCommentEdited: + text = "Comment edited: " + title + text += p.Comment.Body + case api.HookIssueCommentDeleted: + text = "Comment deleted: " + title + text += p.Comment.Body + } + + return &TelegramPayload{ + Message: title + "\n" + text, + }, nil +} + +func getTelegramPullRequestPayload(p *api.PullRequestPayload) (*TelegramPayload, error) { + var text, title string + switch p.Action { + case api.HookIssueOpened: + title = fmt.Sprintf(`[%s] Pull request opened: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueClosed: + if p.PullRequest.HasMerged { + title = fmt.Sprintf(`[%s] Pull request merged: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + } else { + title = fmt.Sprintf(`[%s] Pull request closed: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + } + text = p.PullRequest.Body + case api.HookIssueReOpened: + title = fmt.Sprintf(`[%s] Pull request re-opened: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueEdited: + title = fmt.Sprintf(`[%s] Pull request edited: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueAssigned: + list, err := MakeAssigneeList(&Issue{ID: p.PullRequest.ID}) + if err != nil { + return &TelegramPayload{}, err + } + title = fmt.Sprintf(`[%s] Pull request assigned to %s: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + list, p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueUnassigned: + title = fmt.Sprintf(`[%s] Pull request unassigned: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueLabelUpdated: + title = fmt.Sprintf(`[%s] Pull request labels updated: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueLabelCleared: + title = fmt.Sprintf(`[%s] Pull request labels cleared: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueSynchronized: + title = fmt.Sprintf(`[%s] Pull request synchronized: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueMilestoned: + title = fmt.Sprintf(`[%s] Pull request milestone: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + case api.HookIssueDemilestoned: + title = fmt.Sprintf(`[%s] Pull request clear milestone: #%d %s`, p.Repository.HTMLURL, p.Repository.FullName, + p.PullRequest.HTMLURL, p.Index, p.PullRequest.Title) + text = p.PullRequest.Body + } + + return &TelegramPayload{ + Message: title + "\n" + text, + }, nil +} + +func getTelegramRepositoryPayload(p *api.RepositoryPayload) (*TelegramPayload, error) { + var title string + switch p.Action { + case api.HookRepoCreated: + title = fmt.Sprintf(`[%s] Repository created`, p.Repository.HTMLURL, p.Repository.FullName) + return &TelegramPayload{ + Message: title, + }, nil + case api.HookRepoDeleted: + title = fmt.Sprintf("[%s] Repository deleted", p.Repository.FullName) + return &TelegramPayload{ + Message: title, + }, nil + } + return nil, nil +} + +func getTelegramReleasePayload(p *api.ReleasePayload) (*TelegramPayload, error) { + var title, url string + switch p.Action { + case api.HookReleasePublished: + title = fmt.Sprintf("[%s] Release created", p.Release.TagName) + url = p.Release.URL + return &TelegramPayload{ + Message: title + "\n" + url, + }, nil + case api.HookReleaseUpdated: + title = fmt.Sprintf("[%s] Release updated", p.Release.TagName) + url = p.Release.URL + return &TelegramPayload{ + Message: title + "\n" + url, + }, nil + + case api.HookReleaseDeleted: + title = fmt.Sprintf("[%s] Release deleted", p.Release.TagName) + url = p.Release.URL + return &TelegramPayload{ + Message: title + "\n" + url, + }, nil + } + + return nil, nil +} + +// GetTelegramPayload converts a telegram webhook into a TelegramPayload +func GetTelegramPayload(p api.Payloader, event HookEventType, meta string) (*TelegramPayload, error) { + s := new(TelegramPayload) + + switch event { + case HookEventCreate: + return getTelegramCreatePayload(p.(*api.CreatePayload)) + case HookEventDelete: + return getTelegramDeletePayload(p.(*api.DeletePayload)) + case HookEventFork: + return getTelegramForkPayload(p.(*api.ForkPayload)) + case HookEventIssues: + return getTelegramIssuesPayload(p.(*api.IssuePayload)) + case HookEventIssueComment: + return getTelegramIssueCommentPayload(p.(*api.IssueCommentPayload)) + case HookEventPush: + return getTelegramPushPayload(p.(*api.PushPayload)) + case HookEventPullRequest: + return getTelegramPullRequestPayload(p.(*api.PullRequestPayload)) + case HookEventRepository: + return getTelegramRepositoryPayload(p.(*api.RepositoryPayload)) + case HookEventRelease: + return getTelegramReleasePayload(p.(*api.ReleasePayload)) + } + + return s, nil +} diff --git a/models/webhook_test.go b/models/webhook_test.go index 50106a3792..518be8be8a 100644 --- a/models/webhook_test.go +++ b/models/webhook_test.go @@ -197,18 +197,21 @@ func TestToHookTaskType(t *testing.T) { assert.Equal(t, GOGS, ToHookTaskType("gogs")) assert.Equal(t, SLACK, ToHookTaskType("slack")) assert.Equal(t, GITEA, ToHookTaskType("gitea")) + assert.Equal(t, TELEGRAM, ToHookTaskType("telegram")) } func TestHookTaskType_Name(t *testing.T) { assert.Equal(t, "gogs", GOGS.Name()) assert.Equal(t, "slack", SLACK.Name()) assert.Equal(t, "gitea", GITEA.Name()) + assert.Equal(t, "telegram", TELEGRAM.Name()) } func TestIsValidHookTaskType(t *testing.T) { assert.True(t, IsValidHookTaskType("gogs")) assert.True(t, IsValidHookTaskType("slack")) assert.True(t, IsValidHookTaskType("gitea")) + assert.True(t, IsValidHookTaskType("telegram")) assert.False(t, IsValidHookTaskType("invalid")) } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 990a94dd63..d37a5b94d8 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -263,6 +263,18 @@ func (f *NewDingtalkHookForm) Validate(ctx *macaron.Context, errs binding.Errors return validate(errs, ctx.Data, f, ctx.Locale) } +// NewTelegramHookForm form for creating telegram hook +type NewTelegramHookForm struct { + BotToken string `binding:"Required"` + ChatID string `binding:"Required"` + WebhookForm +} + +// Validate validates the fields +func (f *NewTelegramHookForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { + return validate(errs, ctx.Data, f, ctx.Locale) +} + // .___ // | | ______ ________ __ ____ // | |/ ___// ___/ | \_/ __ \ diff --git a/modules/setting/webhook.go b/modules/setting/webhook.go index 741963e545..0d91e7d9e7 100644 --- a/modules/setting/webhook.go +++ b/modules/setting/webhook.go @@ -25,6 +25,6 @@ func newWebhookService() { Webhook.QueueLength = sec.Key("QUEUE_LENGTH").MustInt(1000) Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5) Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool() - Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk"} + Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram"} Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b53a72da9b..5c391cf566 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1211,6 +1211,7 @@ settings.slack_domain = Domain settings.slack_channel = Channel settings.add_discord_hook_desc = Integrate Discord into your repository. settings.add_dingtalk_hook_desc = Integrate Dingtalk into your repository. +settings.add_telegram_hook_desc = Integrate Telegram into your repository. settings.deploy_keys = Deploy Keys settings.add_deploy_key = Add Deploy Key settings.deploy_key_desc = Deploy keys have read-only pull access to the repository. @@ -1258,6 +1259,8 @@ settings.choose_branch = Choose a branch… settings.no_protected_branch = There are no protected branches. settings.edit_protected_branch = Edit settings.protected_branch_required_approvals_min = Required approvals cannot be negative. +settings.bot_token = Bot Token +settings.chat_id = Chat ID settings.archive.button = Archive Repo settings.archive.header = Archive This Repo settings.archive.text = Archiving the repo will make it entirely read-only. It is hidden from the dashboard, cannot be committed to and no issues or pull-requests can be created. diff --git a/public/img/telegram.png b/public/img/telegram.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0756db5e5f4ab4742c125e3e72bf41e2c246b3 GIT binary patch literal 12399 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 C2ad=9 literal 0 HcmV?d00001 diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 8510cb7ba2..bad109cd53 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -331,6 +331,55 @@ func DingtalkHooksNewPost(ctx *context.Context, form auth.NewDingtalkHookForm) { ctx.Redirect(orCtx.Link) } +// TelegramHooksNewPost response for creating telegram hook +func TelegramHooksNewPost(ctx *context.Context, form auth.NewTelegramHookForm) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksNew"] = true + ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} + + orCtx, err := getOrgRepoCtx(ctx) + if err != nil { + ctx.ServerError("getOrgRepoCtx", err) + return + } + + if ctx.HasError() { + ctx.HTML(200, orCtx.NewTemplate) + return + } + + meta, err := json.Marshal(&models.TelegramMeta{ + BotToken: form.BotToken, + ChatID: form.ChatID, + }) + if err != nil { + ctx.ServerError("Marshal", err) + return + } + + w := &models.Webhook{ + RepoID: orCtx.RepoID, + URL: fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage?chat_id=%s", form.BotToken, form.ChatID), + ContentType: models.ContentTypeJSON, + HookEvent: ParseHookEvent(form.WebhookForm), + IsActive: form.Active, + HookTaskType: models.TELEGRAM, + Meta: string(meta), + OrgID: orCtx.OrgID, + } + if err := w.UpdateEvent(); err != nil { + ctx.ServerError("UpdateEvent", err) + return + } else if err := models.CreateWebhook(w); err != nil { + ctx.ServerError("CreateWebhook", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.settings.add_hook_success")) + ctx.Redirect(orCtx.Link) +} + // SlackHooksNewPost response for creating slack hook func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { ctx.Data["Title"] = ctx.Tr("repo.settings") @@ -421,6 +470,8 @@ func checkWebhook(ctx *context.Context) (*orgRepoCtx, *models.Webhook) { ctx.Data["SlackHook"] = w.GetSlackHook() case models.DISCORD: ctx.Data["DiscordHook"] = w.GetDiscordHook() + case models.TELEGRAM: + ctx.Data["TelegramHook"] = w.GetTelegramHook() } ctx.Data["History"], err = w.History(1) @@ -647,6 +698,46 @@ func DingtalkHooksEditPost(ctx *context.Context, form auth.NewDingtalkHookForm) ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID)) } +// TelegramHooksEditPost response for editing discord hook +func TelegramHooksEditPost(ctx *context.Context, form auth.NewTelegramHookForm) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksEdit"] = true + + orCtx, w := checkWebhook(ctx) + if ctx.Written() { + return + } + ctx.Data["Webhook"] = w + + if ctx.HasError() { + ctx.HTML(200, orCtx.NewTemplate) + return + } + meta, err := json.Marshal(&models.TelegramMeta{ + BotToken: form.BotToken, + ChatID: form.ChatID, + }) + if err != nil { + ctx.ServerError("Marshal", err) + return + } + w.Meta = string(meta) + w.URL = fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage?chat_id=%s", form.BotToken, form.ChatID) + w.HookEvent = ParseHookEvent(form.WebhookForm) + w.IsActive = form.Active + if err := w.UpdateEvent(); err != nil { + ctx.ServerError("UpdateEvent", err) + return + } else if err := models.UpdateWebhook(w); err != nil { + ctx.ServerError("UpdateWebhook", err) + return + } + + ctx.Flash.Success(ctx.Tr("repo.settings.update_hook_success")) + ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID)) +} + // TestWebhook test if web hook is work fine func TestWebhook(ctx *context.Context) { hookID := ctx.ParamsInt64(":id") diff --git a/routers/routes/routes.go b/routers/routes/routes.go index e42222be88..874d6494cb 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -559,12 +559,14 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost) m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost) m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost) + m.Post("/telegram/new", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksNewPost) m.Get("/:id", repo.WebHooksEdit) m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) m.Post("/gogs/:id", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksEditPost) m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost) m.Post("/dingtalk/:id", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksEditPost) + m.Post("/telegram/:id", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksEditPost) }) m.Route("/delete", "GET,POST", org.SettingsDelete) @@ -612,6 +614,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost) m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost) m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost) + m.Post("/telegram/new", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksNewPost) m.Get("/:id", repo.WebHooksEdit) m.Post("/:id/test", repo.TestWebhook) m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) @@ -619,6 +622,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost) m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost) m.Post("/dingtalk/:id", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksEditPost) + m.Post("/telegram/:id", bindIgnErr(auth.NewTelegramHookForm{}), repo.TelegramHooksEditPost) m.Group("/git", func() { m.Get("", repo.GitHooks) diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index 809009b66b..5b216c466b 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -19,6 +19,8 @@ {{else if eq .HookType "dingtalk"}} + {{else if eq .HookType "telegram"}} + {{end}} @@ -28,6 +30,7 @@ {{template "repo/settings/webhook/slack" .}} {{template "repo/settings/webhook/discord" .}} {{template "repo/settings/webhook/dingtalk" .}} + {{template "repo/settings/webhook/telegram" .}} {{template "repo/settings/webhook/history" .}} diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index d2985c3676..ddba0f863c 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -20,6 +20,9 @@ Dingtalk + + Telegram + diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 1b3d114577..8c8b3280e5 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -17,6 +17,8 @@ {{else if eq .HookType "dingtalk"}} + {{else if eq .HookType "telegram"}} + {{end}} @@ -26,6 +28,7 @@ {{template "repo/settings/webhook/slack" .}} {{template "repo/settings/webhook/discord" .}} {{template "repo/settings/webhook/dingtalk" .}} + {{template "repo/settings/webhook/telegram" .}} {{template "repo/settings/webhook/history" .}} diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/repo/settings/webhook/telegram.tmpl new file mode 100644 index 0000000000..598ac44822 --- /dev/null +++ b/templates/repo/settings/webhook/telegram.tmpl @@ -0,0 +1,15 @@ +{{if eq .HookType "telegram"}} +

{{.i18n.Tr "repo.settings.add_telegram_hook_desc" "https://core.telegram.org/bots" | Str2html}}

+
+ {{.CsrfTokenHtml}} +
+ + +
+
+ + +
+ {{template "repo/settings/webhook/settings" .}} +
+{{end}}