From b91fe9d96d1b8be9f6abbb241432d53fd9b61247 Mon Sep 17 00:00:00 2001
From: shyneko <tminei@ukr.net>
Date: Thu, 12 Jan 2023 15:09:05 +0200
Subject: [PATCH 1/6] Added a more telegram options such as thread id, silent
 notifications and forward protect

---
 server/notification-providers/telegram.js | 17 +++++++++---
 src/components/notifications/Telegram.vue | 34 +++++++++++++++++++++++
 src/languages/en.js                       |  6 ++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js
index 2b0576224..9c8f57501 100644
--- a/server/notification-providers/telegram.js
+++ b/server/notification-providers/telegram.js
@@ -9,11 +9,20 @@ class Telegram extends NotificationProvider {
         let okMsg = "Sent Successfully.";
 
         try {
+            const paramsObj =
+            {
+                chat_id: notification.telegramChatID,
+                text: msg,
+                disable_notification: notification.telegramSilentNotification ?? false,
+                protect_content: notification.telegramProtectContent ?? false,
+
+            };
+            // if telegramChatThread specified, then add it to paramsObj
+            if (notification.telegramChatThread && notification.telegramChatThread.length > 0) {
+                paramsObj.message_thread_id = notification.telegramChatThread;
+            }
             await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {
-                params: {
-                    chat_id: notification.telegramChatID,
-                    text: msg,
-                },
+                params: paramsObj
             });
             return okMsg;
 
diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 9daf31ac6..9b373b997 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -29,6 +29,40 @@
             </p>
         </div>
     </div>
+
+    <div class="mb-3">
+        <label for="telegram-chat-thread" class="form-label">{{ $t("Thread ID") }}</label>
+
+        <div class="input-group mb-3">
+            <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control" required>
+        </div>
+
+       <div class="form-text">
+            {{ $t("Thread ID Description") }}
+        </div>
+    </div>
+
+    <div class="mb-3">
+         <div class="form-check form-switch">
+            <input v-model="$parent.notification.telegramSilentNotification" class="form-check-input" type="checkbox">
+            <label class="form-check-label">{{ $t("Silent Notification") }}</label>
+        </div>
+
+        <div class="form-text">
+            {{ $t("Silent Notification Description") }}
+        </div>
+    </div>
+
+    <div class="mb-3">
+         <div class="form-check form-switch">
+            <input v-model="$parent.notification.telegramProtectContent" class="form-check-input" type="checkbox">
+            <label class="form-check-label">{{ $t("Protect Forwarding") }}</label>
+        </div>
+
+        <div class="form-text">
+            {{ $t("Protect Forwarding Description") }}
+        </div>
+    </div>
 </template>
 
 <script>
diff --git a/src/languages/en.js b/src/languages/en.js
index 7a48d0d0c..f09212b8f 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -216,6 +216,12 @@ export default {
     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",
+    "Silent Notification": "Silent Notification",
+    "Silent Notification Description": "If enabled, the notification in Telegram will be without sound.",
+    "Protect Forwarding": "Protect Forwarding",
+    "Protect Forwarding Description": "If enabled, the notification in Telegram will be protected from forwarding and saving.",
+    "Thread ID": "Thread ID (optional)",
+    "Thread ID Description": "Since November 5 2022, bots can send messages to a specific thread. You can get the thread ID by clicking on the thread name in the chat.",
     chatIDNotFound: "Chat ID is not found; please send a message to this bot first",
     webhook: "Webhook",
     "Post URL": "Post URL",

From 521356e38a2a9386c1f981c3b56c0e2e22312de1 Mon Sep 17 00:00:00 2001
From: shyneko <tminei@ukr.net>
Date: Thu, 12 Jan 2023 15:21:56 +0200
Subject: [PATCH 2/6] LINT fixes

---
 src/components/notifications/Telegram.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 9b373b997..7a1e659ea 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -37,13 +37,13 @@
             <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control" required>
         </div>
 
-       <div class="form-text">
+        <div class="form-text">
             {{ $t("Thread ID Description") }}
         </div>
     </div>
 
     <div class="mb-3">
-         <div class="form-check form-switch">
+        <div class="form-check form-switch">
             <input v-model="$parent.notification.telegramSilentNotification" class="form-check-input" type="checkbox">
             <label class="form-check-label">{{ $t("Silent Notification") }}</label>
         </div>
@@ -54,7 +54,7 @@
     </div>
 
     <div class="mb-3">
-         <div class="form-check form-switch">
+        <div class="form-check form-switch">
             <input v-model="$parent.notification.telegramProtectContent" class="form-check-input" type="checkbox">
             <label class="form-check-label">{{ $t("Protect Forwarding") }}</label>
         </div>

From 27e0b1eea103060202e79aa0ae2028165d11b006 Mon Sep 17 00:00:00 2001
From: shyneko <tminei@ukr.net>
Date: Thu, 12 Jan 2023 15:52:50 +0200
Subject: [PATCH 3/6] Remove required attribute for optional field

---
 src/components/notifications/Telegram.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 7a1e659ea..66bc7e933 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -34,7 +34,7 @@
         <label for="telegram-chat-thread" class="form-label">{{ $t("Thread ID") }}</label>
 
         <div class="input-group mb-3">
-            <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control" required>
+            <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control">
         </div>
 
         <div class="form-text">

From e427c70fef567f6957ab681c550e71fd0f92282c Mon Sep 17 00:00:00 2001
From: shyneko <tminei@ukr.net>
Date: Thu, 12 Jan 2023 16:00:02 +0200
Subject: [PATCH 4/6] Translate fixes

---
 src/languages/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index f09212b8f..a1ac41b73 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -219,7 +219,7 @@ export default {
     "Silent Notification": "Silent Notification",
     "Silent Notification Description": "If enabled, the notification in Telegram will be without sound.",
     "Protect Forwarding": "Protect Forwarding",
-    "Protect Forwarding Description": "If enabled, the notification in Telegram will be protected from forwarding and saving.",
+    "Protect Forwarding Description": "If enabled, the bot messages in Telegram will be protected from forwarding and saving.",
     "Thread ID": "Thread ID (optional)",
     "Thread ID Description": "Since November 5 2022, bots can send messages to a specific thread. You can get the thread ID by clicking on the thread name in the chat.",
     chatIDNotFound: "Chat ID is not found; please send a message to this bot first",

From 2fa233ae7fa76eaf82bf7658c42dd61dc21cd22c Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:12:57 +0800
Subject: [PATCH 5/6] Fix prometheus null issues

---
 server/model/monitor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 4bb859e9a..d6e1896a0 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -755,7 +755,7 @@ class Monitor extends BeanModel {
             await R.store(bean);
 
             log.debug("monitor", `[${this.name}] prometheus.update`);
-            this.prometheus.update(bean, tlsInfo);
+            this.prometheus?.update(bean, tlsInfo);
 
             previousBeat = bean;
 
@@ -840,7 +840,7 @@ class Monitor extends BeanModel {
         clearTimeout(this.heartbeatInterval);
         this.isStop = true;
 
-        this.prometheus.remove();
+        this.prometheus?.remove();
     }
 
     /**

From af82ea742cbe1559b0fbc8d4cf80f7d850d5ae30 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:21:53 +0800
Subject: [PATCH 6/6] Merge manually

---
 src/components/notifications/Telegram.vue | 27 ++---------------------
 src/lang/en.json                          |  2 ++
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 46824538f..a7e46fded 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -43,37 +43,14 @@
         </div>
     </div>
 
-    <div class="mb-3">
-        <label for="telegram-chat-thread" class="form-label">{{ $t("Thread ID") }}</label>
-
-        <div class="input-group mb-3">
-            <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control">
-        </div>
-
-        <div class="form-text">
-            {{ $t("Thread ID Description") }}
-        </div>
-    </div>
-
-    <div class="mb-3">
-        <div class="form-check form-switch">
-            <input v-model="$parent.notification.telegramSilentNotification" class="form-check-input" type="checkbox">
-            <label class="form-check-label">{{ $t("Silent Notification") }}</label>
-        </div>
-
-        <div class="form-text">
-            {{ $t("Silent Notification Description") }}
-        </div>
-    </div>
-
     <div class="mb-3">
         <div class="form-check form-switch">
             <input v-model="$parent.notification.telegramProtectContent" class="form-check-input" type="checkbox">
-            <label class="form-check-label">{{ $t("Protect Forwarding") }}</label>
+            <label class="form-check-label">{{ $t("telegramProtectContent") }}</label>
         </div>
 
         <div class="form-text">
-            {{ $t("Protect Forwarding Description") }}
+            {{ $t("telegramProtectContentDescription") }}
         </div>
     </div>
 </template>
diff --git a/src/lang/en.json b/src/lang/en.json
index ef6cb688c..478ddddca 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -365,6 +365,8 @@
     "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.",
+    "telegramProtectContent": "Protect Forwarding/Saving",
+    "telegramProtectContentDescription": "If enabled, the bot messages in Telegram will be protected from forwarding and saving.",
     "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",