diff --git a/conf/app.ini b/conf/app.ini index 955c0072122..72ec7b5380b 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -354,6 +354,10 @@ DELIVER_TIMEOUT = 15 SKIP_TLS_VERIFY = false ; The number of history information in each page. PAGING_NUM = 10 +; Enclose commit author into backticks for Slack +SLACK_BACKTICKS_AUTHOR = false +; Enclose commit titls into backticks for Slack +SLACK_BACKTICKS_TITLE = false ; General settings of loggers. [log] diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini index cb4c8f8e3c6..8bba5d21cb2 100644 --- a/conf/locale/locale_bg-BG.ini +++ b/conf/locale/locale_bg-BG.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Конфигурация на уеб-куки config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Конфигурация на git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_cs-CZ.ini b/conf/locale/locale_cs-CZ.ini index 466c59f6287..83b39b0044d 100644 --- a/conf/locale/locale_cs-CZ.ini +++ b/conf/locale/locale_cs-CZ.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Nastavení webových háčků config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Konfigurace Gitu config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index 36a1822a588..0bb7fe2a7aa 100644 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook-Konfiguration config.webhook.types=Typen config.webhook.deliver_timeout=Zeitlimit für Zustellung config.webhook.skip_tls_verify=TLS-Prüfung überspringen +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git Konfiguration config.git.disable_diff_highlight=Diff-Syntaxhervorhebung ausschalten diff --git a/conf/locale/locale_en-GB.ini b/conf/locale/locale_en-GB.ini index ba7062c8544..b1e16271f88 100644 --- a/conf/locale/locale_en-GB.ini +++ b/conf/locale/locale_en-GB.ini @@ -1404,6 +1404,8 @@ config.webhook_config=Webhook Configuration config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git Configuration config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index ff9ada603ed..ce57a546807 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -1330,6 +1330,8 @@ config.webhook_config = Webhook configuration config.webhook.types = Types config.webhook.deliver_timeout = Deliver timeout config.webhook.skip_tls_verify = Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config = Git configuration config.git.disable_diff_highlight = Disable diff syntax highlight diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini index da9987ad344..809ac137309 100644 --- a/conf/locale/locale_es-ES.ini +++ b/conf/locale/locale_es-ES.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Configuración de Webhooks config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configuración de Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_fa-IR.ini b/conf/locale/locale_fa-IR.ini index 39ecc08f624..a569de4827f 100644 --- a/conf/locale/locale_fa-IR.ini +++ b/conf/locale/locale_fa-IR.ini @@ -1329,6 +1329,8 @@ config.webhook_config=تنظیمات Webhook config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=پیکربندی Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_fi-FI.ini b/conf/locale/locale_fi-FI.ini index 87c5754d4b0..60bfcecd13e 100644 --- a/conf/locale/locale_fi-FI.ini +++ b/conf/locale/locale_fi-FI.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webkoukku asetukset config.webhook.types=Tyypit config.webhook.deliver_timeout=Toimitus aikakatkaisu config.webhook.skip_tls_verify=Ohita TLS tarkistaminen +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git asetukset config.git.disable_diff_highlight=Poista koodinväritys käytöstä diff-näkymässä diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini index f82506072c0..71b17af3bc4 100644 --- a/conf/locale/locale_fr-FR.ini +++ b/conf/locale/locale_fr-FR.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Configuration Webhook config.webhook.types=Types config.webhook.deliver_timeout=Délai de livraison config.webhook.skip_tls_verify=Ignorer la vérification TLS +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configuration de Git config.git.disable_diff_highlight=Désactiver la coloration syntaxique des différences diff --git a/conf/locale/locale_gl-ES.ini b/conf/locale/locale_gl-ES.ini index 8c36256d874..dc34f61d0d3 100644 --- a/conf/locale/locale_gl-ES.ini +++ b/conf/locale/locale_gl-ES.ini @@ -1328,6 +1328,8 @@ config.webhook_config=Configuración de Webhooks config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configuración de git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_hu-HU.ini b/conf/locale/locale_hu-HU.ini index 70d5b236604..05f8692ed5e 100644 --- a/conf/locale/locale_hu-HU.ini +++ b/conf/locale/locale_hu-HU.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook beállítás config.webhook.types=Típusok config.webhook.deliver_timeout=Kézbesítési időtúllépés config.webhook.skip_tls_verify=TLS ellenőrzés kihagyása +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git konfiguráció config.git.disable_diff_highlight=Különbségi szintakszis kiemelésének kikapcsolása diff --git a/conf/locale/locale_id-ID.ini b/conf/locale/locale_id-ID.ini index df81d7bbbb1..e6a479b0e10 100644 --- a/conf/locale/locale_id-ID.ini +++ b/conf/locale/locale_id-ID.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook Konfigurasi config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Konfigurasi Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini index f5e9ed993aa..cc2a1cf0ede 100644 --- a/conf/locale/locale_it-IT.ini +++ b/conf/locale/locale_it-IT.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Configurazione Webhook config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configurazione Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini index 94024bb3914..57b501919c5 100644 --- a/conf/locale/locale_ja-JP.ini +++ b/conf/locale/locale_ja-JP.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook設定 config.webhook.types=Types config.webhook.deliver_timeout=配信のタイムアウト config.webhook.skip_tls_verify=TLS検証をスキップ +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git 設定 config.git.disable_diff_highlight=Diff のシンタックスハイライトを無効にする diff --git a/conf/locale/locale_ko-KR.ini b/conf/locale/locale_ko-KR.ini index 6ad5910829b..0b53f040e6f 100644 --- a/conf/locale/locale_ko-KR.ini +++ b/conf/locale/locale_ko-KR.ini @@ -1328,6 +1328,8 @@ config.webhook_config=웹훅 설정 config.webhook.types=유형 config.webhook.deliver_timeout=배달 제한 시간 config.webhook.skip_tls_verify=TLS 검증 건너뛰기 +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=깃 설정 config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini index 7e5f861f5fa..51ce20cb42c 100644 --- a/conf/locale/locale_lv-LV.ini +++ b/conf/locale/locale_lv-LV.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Tīkla āķu konfigurācija config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git konfigurācija config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_mn-MN.ini b/conf/locale/locale_mn-MN.ini index 6bfc37722a4..f214c6247d1 100644 --- a/conf/locale/locale_mn-MN.ini +++ b/conf/locale/locale_mn-MN.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook тохиргоо config.webhook.types=Төрлүүд config.webhook.deliver_timeout=Дамжуулах хугацаа config.webhook.skip_tls_verify=TLS баталгаажуулалтыг алгасах +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git тохиргоо config.git.disable_diff_highlight=Ялгааг тодруулж харуулахыг болих diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini index 1c6186b3d66..311478623b5 100644 --- a/conf/locale/locale_nl-NL.ini +++ b/conf/locale/locale_nl-NL.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook configuratie config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Gitconfiguratie config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini index d33db7a386d..ec0fa87e94a 100644 --- a/conf/locale/locale_pl-PL.ini +++ b/conf/locale/locale_pl-PL.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Konfiguracja webhooka config.webhook.types=Typy config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Pomiń weryfikację TLS +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Konfiguracja Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini index ef0878fc18b..81438512921 100644 --- a/conf/locale/locale_pt-BR.ini +++ b/conf/locale/locale_pt-BR.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Configuração de Hook da Web config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configuração do Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_pt-PT.ini b/conf/locale/locale_pt-PT.ini index fae73164bb6..c591df773c3 100644 --- a/conf/locale/locale_pt-PT.ini +++ b/conf/locale/locale_pt-PT.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Configuração de WebHook config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configuração Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_ro-RO.ini b/conf/locale/locale_ro-RO.ini index 8655e846678..18d838190e3 100644 --- a/conf/locale/locale_ro-RO.ini +++ b/conf/locale/locale_ro-RO.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webhook configurare config.webhook.types=Tipuri config.webhook.deliver_timeout=Timeout pentru livrare config.webhook.skip_tls_verify=Sari peste verificarea TLS +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Configurare Git config.git.disable_diff_highlight=Dezactivează evidențierea sintaxei diff diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini index 1dc3b42de6d..5db5874ede9 100644 --- a/conf/locale/locale_ru-RU.ini +++ b/conf/locale/locale_ru-RU.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Конфигурация Webhook config.webhook.types=Типы config.webhook.deliver_timeout=Таймаут доставки config.webhook.skip_tls_verify=Пропустить проверку TLS +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Конфигурация GIT config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_sk-SK.ini b/conf/locale/locale_sk-SK.ini index 4895df9ae5e..c358807323c 100644 --- a/conf/locale/locale_sk-SK.ini +++ b/conf/locale/locale_sk-SK.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Nastavenie webových háčikov config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Konfigurácia Gitu config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_sr-SP.ini b/conf/locale/locale_sr-SP.ini index fdf7319ad96..40d80c2b505 100644 --- a/conf/locale/locale_sr-SP.ini +++ b/conf/locale/locale_sr-SP.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Подешавања Webhook config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git конфигурација config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_sv-SE.ini b/conf/locale/locale_sv-SE.ini index aaa7d0b8daa..529a56e6a91 100644 --- a/conf/locale/locale_sv-SE.ini +++ b/conf/locale/locale_sv-SE.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Webbkrokskonfiguration config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git-konfiguration config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_tr-TR.ini b/conf/locale/locale_tr-TR.ini index e8324b345e5..ea1ab78f4a5 100644 --- a/conf/locale/locale_tr-TR.ini +++ b/conf/locale/locale_tr-TR.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Web İstekleri Yapılandırması config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git Yapılandırması config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_uk-UA.ini b/conf/locale/locale_uk-UA.ini index 39f66d8dbb3..6a95b5fa073 100644 --- a/conf/locale/locale_uk-UA.ini +++ b/conf/locale/locale_uk-UA.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Налаштування web-хуків config.webhook.types=Типи config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Налаштування git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_vi-VN.ini b/conf/locale/locale_vi-VN.ini index 83202160f39..a00a79e0536 100644 --- a/conf/locale/locale_vi-VN.ini +++ b/conf/locale/locale_vi-VN.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Cấu hình Webhook config.webhook.types=Kiểu config.webhook.deliver_timeout=Thời gian chờ phân phối config.webhook.skip_tls_verify=Bỏ qua xác thực TLS +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Cấu hình Git config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 33b5788b1da..01d6d49c6b2 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -1328,6 +1328,8 @@ config.webhook_config=Web 钩子配置 config.webhook.types=类型 config.webhook.deliver_timeout=推送超时 config.webhook.skip_tls_verify=忽略 TLS 验证 +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git 配置 config.git.disable_diff_highlight=禁用差异对比语法高亮 diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini index ca433b4b2be..0dbad329c86 100644 --- a/conf/locale/locale_zh-HK.ini +++ b/conf/locale/locale_zh-HK.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Web 鉤子配置 config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git configuration config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/conf/locale/locale_zh-TW.ini b/conf/locale/locale_zh-TW.ini index a93aee20351..64accea2d8a 100644 --- a/conf/locale/locale_zh-TW.ini +++ b/conf/locale/locale_zh-TW.ini @@ -1327,6 +1327,8 @@ config.webhook_config=Web 鉤子配置 config.webhook.types=Types config.webhook.deliver_timeout=Deliver timeout config.webhook.skip_tls_verify=Skip TLS verify +config.webhook.slack_backticks_author=Enclose commit author into backticks for Slack +config.webhook.slack_backticks_title=Enclose commit title into backticks for Slack config.git_config=Git 配置 config.git.disable_diff_highlight=Disable diff syntax highlight diff --git a/internal/conf/conf.go b/internal/conf/conf.go index f7a6f88666f..92bac1af728 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -349,6 +349,12 @@ func Init(customConf string) error { } LFS.ObjectsPath = ensureAbs(LFS.ObjectsPath) + // **************************** + // ----- Webhook settings ----- + // **************************** + Webhook.SlackBackticksTitle = false; + Webhook.SlackBackticksAuthor = false; + handleDeprecated() if err = File.Section("cache").MapTo(&Cache); err != nil { diff --git a/internal/conf/static.go b/internal/conf/static.go index 016fd139cb8..89bfbb44fca 100644 --- a/internal/conf/static.go +++ b/internal/conf/static.go @@ -133,10 +133,12 @@ var ( // Webhook settings Webhook struct { - Types []string - DeliverTimeout int - SkipTLSVerify bool `ini:"SKIP_TLS_VERIFY"` - PagingNum int + Types []string + DeliverTimeout int + SkipTLSVerify bool `ini:"SKIP_TLS_VERIFY"` + PagingNum int + SlackBackticksAuthor bool `ini:"SLACK_BACKTICKS_AUTHOR"` + SlackBackticksTitle bool `ini:"SLACK_BACKTICKS_TITLE"` } // Markdown settings diff --git a/internal/db/webhook_slack.go b/internal/db/webhook_slack.go index 766f5a4e5df..0d968bc5e08 100644 --- a/internal/db/webhook_slack.go +++ b/internal/db/webhook_slack.go @@ -71,6 +71,24 @@ func SlackLinkFormatter(url, text string) string { return fmt.Sprintf("<%s|%s>", url, SlackTextFormatter(text)) } +func SlackEncloseAuthor(author string) string { + enclose := conf.Webhook.SlackBackticksAuthor; + f := "%s" + if enclose { + f = "`" + f + "`" + } + return fmt.Sprintf(f, author) +} + +func SlackEncloseTitle(title string) string { + enclose := conf.Webhook.SlackBackticksTitle; + f := "%s" + if enclose { + f = "`" + f + "`" + } + return fmt.Sprintf(f, title) +} + // getSlackCreatePayload composes Slack payload for create new branch or tag. func getSlackCreatePayload(p *api.CreatePayload) *SlackPayload { refName := git.RefShortName(p.Ref) @@ -128,7 +146,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) *SlackPayload { var attachmentText string // for each commit, generate attachment text for i, commit := range p.Commits { - attachmentText += fmt.Sprintf("%s: %s - %s", SlackLinkFormatter(commit.URL, commit.ID[:7]), SlackShortTextFormatter(commit.Message), SlackTextFormatter(commit.Author.Name)) + attachmentText += fmt.Sprintf("%s: %s - %s", SlackLinkFormatter(commit.URL, commit.ID[:7]), SlackEncloseTitle(SlackShortTextFormatter(commit.Message)), SlackEncloseAuthor(SlackTextFormatter(commit.Author.Name))) // add linebreak to each commit but the last if i < len(p.Commits)-1 { attachmentText += "\n" @@ -150,7 +168,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) *SlackPayload { func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) *SlackPayload { senderLink := SlackLinkFormatter(conf.Server.ExternalURL+p.Sender.UserName, p.Sender.UserName) titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Index), - fmt.Sprintf("#%d %s", p.Index, p.Issue.Title)) + fmt.Sprintf("#%d %s", p.Index, SlackEncloseTitle(p.Issue.Title))) var text, title, attachmentText string switch p.Action { case api.HOOK_ISSUE_OPENED: @@ -196,7 +214,7 @@ func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) *SlackPayload func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) *SlackPayload { senderLink := SlackLinkFormatter(conf.Server.ExternalURL+p.Sender.UserName, p.Sender.UserName) titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d#%s", p.Repository.HTMLURL, p.Issue.Index, CommentHashTag(p.Comment.ID)), - fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title)) + fmt.Sprintf("#%d %s", p.Issue.Index, SlackEncloseTitle(p.Issue.Title))) var text, title, attachmentText string switch p.Action { case api.HOOK_ISSUE_COMMENT_CREATED: @@ -210,7 +228,7 @@ func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) * case api.HOOK_ISSUE_COMMENT_DELETED: text = fmt.Sprintf("[%s] Comment deleted by %s", p.Repository.FullName, senderLink) title = SlackLinkFormatter(fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Issue.Index), - fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title)) + fmt.Sprintf("#%d %s", p.Issue.Index, SlackEncloseTitle(p.Issue.Title))) attachmentText = SlackTextFormatter(p.Comment.Body) } @@ -230,7 +248,7 @@ func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) * func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) *SlackPayload { senderLink := SlackLinkFormatter(conf.Server.ExternalURL+p.Sender.UserName, p.Sender.UserName) titleLink := SlackLinkFormatter(fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index), - fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title)) + fmt.Sprintf("#%d %s", p.Index, SlackEncloseTitle(p.PullRequest.Title))) var text, title, attachmentText string switch p.Action { case api.HOOK_ISSUE_OPENED: diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index e84016ec3b5..c8455e1f210 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -461,6 +461,10 @@
{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
{{.i18n.Tr "admin.config.webhook.skip_tls_verify"}}
+
{{.i18n.Tr "admin.config.webhook.slack_backticks_author"}}
+
+
{{.i18n.Tr "admin.config.webhook.slack_backticks_title"}}
+
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy