From 10228874fa41c7afaf4cca8ac72f3edc9ab9f5bd Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Fri, 24 Feb 2023 16:54:58 +0800 Subject: [PATCH] Merge manually --- server/notification-providers/telegram.js | 1 + src/components/notifications/Telegram.vue | 2 +- src/lang/en.json | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js index 7f46b3fc7..614e487ed 100644 --- a/server/notification-providers/telegram.js +++ b/server/notification-providers/telegram.js @@ -12,6 +12,7 @@ class Telegram extends NotificationProvider { let params = { chat_id: notification.telegramChatID, text: msg, + disable_notification: notification.telegramSendSilently ?? false, }; if (notification.telegramMessageThreadID) { params.message_thread_id = notification.telegramMessageThreadID; diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue index 7816de740..a90ceafc1 100644 --- a/src/components/notifications/Telegram.vue +++ b/src/components/notifications/Telegram.vue @@ -35,7 +35,7 @@
- +
diff --git a/src/lang/en.json b/src/lang/en.json index c1249d31a..ef6cb688c 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -363,6 +363,8 @@ "Chat ID": "Chat ID", "telegramMessageThreadID": "(Optional) Message Thread ID", "telegramMessageThreadIDDescription": "Optional Unique identifier for the target message thread (topic) of the forum; for forum supergroups only", + "telegramSendSilently": "Send Silently", + "telegramSendSilentlyDescription": "Sends the message silently. Users will receive a notification with no sound.", "supportTelegramChatID": "Support Direct Chat / Group / Channel's Chat ID", "wayToGetTelegramChatID": "You can get your chat ID by sending a message to the bot and going to this URL to view the chat_id:", "YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",