From de7df46aa801c725426489a951d5f777d9ef55c7 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 22 Feb 2023 04:27:12 +0800
Subject: [PATCH 1/4] Sort the notification list by name and remove translation
 keys of brand names or product names

---
 src/components/NotificationDialog.vue   | 74 +++++++++++++++++++++++--
 src/components/notifications/Gorush.vue |  2 +-
 src/lang/en.json                        | 29 ----------
 src/lang/zh-CN.json                     |  2 -
 4 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 0ca95c2222..02ddce800f 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -13,7 +13,7 @@
                         <div class="mb-3">
                             <label for="notification-type" class="form-label">{{ $t("Notification Type") }}</label>
                             <select id="notification-type" v-model="notification.type" class="form-select">
-                                <option v-for="type in notificationTypes" :key="type" :value="type">{{ $t(type) }}</option>
+                                <option v-for="(name, type) in notificationNameList" :key="type" :value="type">{{ name }}</option>
                             </select>
                         </div>
 
@@ -67,7 +67,7 @@
     </Confirm>
 </template>
 
-<script lang="ts">
+<script>
 import { Modal } from "bootstrap";
 
 import Confirm from "./Confirm.vue";
@@ -103,7 +103,71 @@ export default {
                 return null;
             }
             return NotificationFormList[this.notification.type];
-        }
+        },
+
+        notificationNameList() {
+            let list = {
+                "alerta": "Alerta",
+                "AlertNow": "AlertNow",
+                "AliyunSMS": "AliyunSMS (阿里云短信服务)",
+                "apprise": this.$t("apprise"),
+                "Bark": "Bark",
+                "clicksendsms": "ClickSend SMS",
+                "DingDing": "DingDing (钉钉自定义机器人)",
+                "discord": "Discord",
+                "Feishu": "Feishu (飞书)",
+                "FreeMobile": "FreeMobile",
+                "GoogleChat": "Google Chat (Google Workspace)",
+                "gorush": "Gorush",
+                "gotify": "Gotify",
+                "HomeAssistant": "Home Assistant",
+                "Kook": "Kook",
+                "line": "LINE Messenger",
+                "LineNotify": "LINE Notify",
+                "lunasea": "LunaSea",
+                "matrix": "Matrix",
+                "mattermost": "Mattermost",
+                "ntfy": "Ntfy",
+                "octopush": "Octopush",
+                "OneBot": "OneBot",
+                "PagerDuty": "PagerDuty",
+                "promosms": "PromoSMS",
+                "pushbullet": "Pushbullet",
+                "PushByTechulus": "Push by Techulus",
+                "PushDeer": "PushDeer",
+                "pushover": "Pushover",
+                "pushy": "Pushy",
+                "rocket.chat": "Rocket.Chat",
+                "serwersms": "SerwerSMS.pl",
+                "signal": "Signal",
+                "SMSManager": "SmsManager (smsmanager.cz)",
+                "slack": "Slack",
+                "squadcast": "SquadCast",
+                "SMSEagle": "SMSEagle",
+                "smtp": this.$t("smtp"),
+                "stackfield": "Stackfield",
+                "teams": "Microsoft Teams",
+                "telegram": "Telegram",
+                "Splunk": "Splunk",
+                "webhook": "Webhook",
+                "WeCom": "WeCom (企业微信群机器人)",
+                "GoAlert": "GoAlert",
+                "ServerChan": "ServerChan (Server酱)",
+                "ZohoCliq": "ZohoCliq"
+            };
+
+            // Sort by notification name
+            // No idea how, but it works
+            // https://stackoverflow.com/questions/1069666/sorting-object-property-by-values
+            const sortable = Object.entries(list)
+                .sort(([ , a ], [ , b ]) => a - b)
+                .reduce((r, [ k, v ]) => ({
+                    ...r,
+                    [k]: v
+                }), {});
+
+            return sortable;
+        },
     },
 
     watch: {
@@ -203,6 +267,7 @@ export default {
          * @return {string}
          */
         getUniqueDefaultName(notificationKey) {
+            /*
             let index = 1;
             let name = "";
             do {
@@ -211,7 +276,8 @@ export default {
                     number: index++
                 });
             } while (this.$root.notificationList.find(it => it.name === name));
-            return name;
+            return name;*/
+            return "123";
         }
     },
 };
diff --git a/src/components/notifications/Gorush.vue b/src/components/notifications/Gorush.vue
index b53be2d269..315ee677ec 100644
--- a/src/components/notifications/Gorush.vue
+++ b/src/components/notifications/Gorush.vue
@@ -16,7 +16,7 @@
     <div class="mb-3">
         <label for="gorush-platform" class="form-label">{{ $t("Platform") }}</label><span style="color: red;"><sup>*</sup></span>
         <select id="gorush-platform" v-model="$parent.notification.gorushPlatform" class="form-select">
-            <option value="ios">{{ $t("iOS") }}</option>
+            <option value="ios">iOS</option>
             <option value="android">{{ $t("Android") }}</option>
             <option value="huawei">{{ $t("Huawei") }}</option>
         </select>
diff --git a/src/lang/en.json b/src/lang/en.json
index 1e3242ca9f..97941a5b00 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -186,7 +186,6 @@
     "defaultNotificationName": "My {notification} Alert ({number})",
     "here": "here",
     "Required": "Required",
-    "webhook": "Webhook",
     "Post URL": "Post URL",
     "Content Type": "Content Type",
     "webhookJsonDesc": "{0} is good for any modern HTTP servers such as Express.js",
@@ -360,7 +359,6 @@
     "Workstation": "Workstation",
     "Packet Size": "Packet Size",
     "telegram": "Telegram",
-    "ZohoCliq": "ZohoCliq",
     "Bot Token": "Bot Token",
     "wayToGetTelegramToken": "You can get a token from {0}.",
     "Chat ID": "Chat ID",
@@ -388,7 +386,6 @@
     "backupOutdatedWarning": "Deprecated: Since a lot of features were added and this backup feature is a bit unmaintained, it cannot generate or restore a complete backup.",
     "backupRecommend": "Please backup the volume or the data folder (./data/) directly instead.",
     "Optional": "Optional",
-    "squadcast": "Squadcast",
     "or": "or",
     "recurringInterval": "Interval",
     "Recurring": "Recurring",
@@ -530,28 +527,11 @@
     "pushoversounds none": "None (silent)",
     "pushyAPIKey": "Secret API Key",
     "pushyToken": "Device token",
-    "discord": "Discord",
-    "teams": "Microsoft Teams",
-    "signal": "Signal",
-    "gotify": "Gotify",
-    "slack": "Slack",
-    "rocket.chat": "Rocket.Chat",
-    "pushover": "Pushover",
-    "pushy": "Pushy",
-    "PushByTechulus": "Push by Techulus",
-    "octopush": "Octopush",
-    "promosms": "PromoSMS",
-    "clicksendsms": "ClickSend SMS",
-    "lunasea": "LunaSea",
     "apprise": "Apprise (Support 50+ Notification services)",
     "GoogleChat": "Google Chat (Google Workspace only)",
-    "pushbullet": "Pushbullet",
-    "Kook": "Kook",
     "wayToGetKookBotToken": "Create application and get your bot token at {0}",
     "wayToGetKookGuildID": "Switch on 'Developer Mode' in Kook setting, and right click the guild to get its ID",
     "Guild ID": "Guild ID",
-    "line": "Line Messenger",
-    "mattermost": "Mattermost",
     "User Key": "User Key",
     "Device": "Device",
     "Message Title": "Message Title",
@@ -586,12 +566,10 @@
     "SendKey": "SendKey",
     "SMSManager API Docs": "SMSManager API Docs ",
     "Gateway Type": "Gateway Type",
-    "SMSManager": "SMSManager",
     "You can divide numbers with": "You can divide numbers with",
     "Base URL": "Base URL",
     "goAlertInfo": "GoAlert is a An open source application for on-call scheduling, automated escalations and notifications (like SMS or voice calls). Automatically engage the right person, the right way, and at the right time! {0}",
     "goAlertIntegrationKeyInfo": "Get generic API integration key for the service in this format \"aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee\" usually the value of token parameter of copied URL.",
-    "goAlert": "GoAlert",
     "AccessKeyId": "AccessKey ID",
     "SecretAccessKey": "AccessKey Secret",
     "PhoneNumbers": "PhoneNumbers",
@@ -606,7 +584,6 @@
     "For safety, must use secret key": "For safety, must use secret key",
     "Device Token": "Device Token",
     "Platform": "Platform",
-    "iOS": "iOS",
     "Android": "Android",
     "Huawei": "Huawei",
     "High": "High",
@@ -617,7 +594,6 @@
     "Proxy Protocol": "Proxy Protocol",
     "Proxy Server": "Proxy Server",
     "Proxy server has authentication": "Proxy server has authentication",
-    "matrix": "Matrix",
     "promosmsTypeEco": "SMS ECO - cheap but slow and often overloaded. Limited only to Polish recipients.",
     "promosmsTypeFlash": "SMS FLASH - Message will automatically show on recipient device. Limited only to Polish recipients.",
     "promosmsTypeFull": "SMS FULL - Premium tier of SMS, You can use your Sender Name (You need to register name first). Reliable for alerts.",
@@ -653,19 +629,15 @@
     "do nothing": "do nothing",
     "auto acknowledged": "auto acknowledged",
     "auto resolve": "auto resolve",
-    "gorush": "Gorush",
-    "alerta": "Alerta",
     "alertaApiEndpoint": "API Endpoint",
     "alertaEnvironment": "Environment",
     "alertaApiKey": "API Key",
     "alertaAlertState": "Alert State",
     "alertaRecoverState": "Recover State",
-    "serwersms": "SerwerSMS.pl",
     "serwersmsAPIUser": "API Username (incl. webapi_ prefix)",
     "serwersmsAPIPassword": "API Password",
     "serwersmsPhoneNumber": "Phone number",
     "serwersmsSenderName": "SMS Sender Name (registered via customer portal)",
-    "smseagle": "SMSEagle",
     "smseagleTo": "Phone number(s)",
     "smseagleGroup": "Phonebook group name(s)",
     "smseagleContact": "Phonebook contact name(s)",
@@ -675,7 +647,6 @@
     "smseagleUrl": "Your SMSEagle device URL",
     "smseagleEncoding": "Send as Unicode",
     "smseaglePriority": "Message priority (0-9, default = 0)",
-    "stackfield": "Stackfield",
     "Recipient Number": "Recipient Number",
     "From Name/Number": "From Name/Number",
     "Leave blank to use a shared sender number.": "Leave blank to use a shared sender number.",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index f3a222dc94..a053959395 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -272,7 +272,6 @@
     "apprise": "Apprise (支持 50+ 种通知服务)",
     "GoogleChat": "Google Chat（仅 Google Workspace）",
     "pushbullet": "Pushbullet",
-    "AliyunSMS": "阿里云短信服务",
     "Kook": "Kook",
     "wayToGetKookBotToken": "在 {0} 创建应用并获取机器人 Token",
     "wayToGetKookGuildID": "在 Kook 设置中打开“开发者模式”，然后右键点击频道可获取其 ID",
@@ -448,7 +447,6 @@
     "Bark Endpoint": "Bark 接入点",
     "Bark Group": "Bark 群组",
     "Bark Sound": "Bark 铃声",
-    "DingDing": "钉钉自定义机器人",
     "WebHookUrl": "钉钉自定义机器人 Webhook 地址",
     "SecretKey": "钉钉自定义机器人加签密钥",
     "For safety, must use secret key": "出于安全考虑，必须使用加签密钥",

From 7da48b27a57015d83341070bff1aa7cd9376ed47 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 22 Feb 2023 04:29:43 +0800
Subject: [PATCH 2/4] Fix `getUniqueDefaultName`

---
 src/components/NotificationDialog.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 02ddce800f..9631538e7b 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -267,17 +267,16 @@ export default {
          * @return {string}
          */
         getUniqueDefaultName(notificationKey) {
-            /*
+
             let index = 1;
             let name = "";
             do {
                 name = this.$t("defaultNotificationName", {
-                    notification: this.$t(notificationKey).replace(/\(.+\)/, "").trim(),
+                    notification: this.notificationNameList[notificationKey].replace(/\(.+\)/, "").trim(),
                     number: index++
                 });
             } while (this.$root.notificationList.find(it => it.name === name));
-            return name;*/
-            return "123";
+            return name;
         }
     },
 };

From df5da0054e8b12ba44e8a9ec0a5d8ad9d1ee790d Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Wed, 22 Feb 2023 04:40:03 +0800
Subject: [PATCH 3/4] Remove more keys

---
 src/lang/en.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 97941a5b00..cfbad0b6f8 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -358,7 +358,6 @@
     "Domain": "Domain",
     "Workstation": "Workstation",
     "Packet Size": "Packet Size",
-    "telegram": "Telegram",
     "Bot Token": "Bot Token",
     "wayToGetTelegramToken": "You can get a token from {0}.",
     "Chat ID": "Chat ID",
@@ -653,7 +652,6 @@
     "Octopush API Version": "Octopush API Version",
     "Legacy Octopush-DM": "Legacy Octopush-DM",
     "ntfy Topic": "ntfy Topic",
-    "HomeAssistant": "Home Assistant",
     "onebotHttpAddress": "OneBot HTTP Address",
     "onebotMessageType": "OneBot Message Type",
     "onebotGroupMessage": "Group",

From fa7f75a930606d4365039395eb2894cb739ec674 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:01:42 +0800
Subject: [PATCH 4/4] Organize notification list

---
 src/components/NotificationDialog.vue | 65 ++++++++++++++++++---------
 src/lang/en.json                      |  1 +
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 9631538e7b..c3851b568f 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -13,7 +13,10 @@
                         <div class="mb-3">
                             <label for="notification-type" class="form-label">{{ $t("Notification Type") }}</label>
                             <select id="notification-type" v-model="notification.type" class="form-select">
-                                <option v-for="(name, type) in notificationNameList" :key="type" :value="type">{{ name }}</option>
+                                <option v-for="(name, type) in notificationNameList.regularList" :key="type" :value="type">{{ name }}</option>
+                                <optgroup :label="$t('notificationRegional')">
+                                    <option v-for="(name, type) in notificationNameList.regionalList" :key="type" :value="type">{{ name }}</option>
+                                </optgroup>
                             </select>
                         </div>
 
@@ -106,17 +109,13 @@ export default {
         },
 
         notificationNameList() {
-            let list = {
+            let regularList = {
                 "alerta": "Alerta",
                 "AlertNow": "AlertNow",
-                "AliyunSMS": "AliyunSMS (阿里云短信服务)",
                 "apprise": this.$t("apprise"),
                 "Bark": "Bark",
                 "clicksendsms": "ClickSend SMS",
-                "DingDing": "DingDing (钉钉自定义机器人)",
                 "discord": "Discord",
-                "Feishu": "Feishu (飞书)",
-                "FreeMobile": "FreeMobile",
                 "GoogleChat": "Google Chat (Google Workspace)",
                 "gorush": "Gorush",
                 "gotify": "Gotify",
@@ -131,16 +130,12 @@ export default {
                 "octopush": "Octopush",
                 "OneBot": "OneBot",
                 "PagerDuty": "PagerDuty",
-                "promosms": "PromoSMS",
                 "pushbullet": "Pushbullet",
                 "PushByTechulus": "Push by Techulus",
-                "PushDeer": "PushDeer",
                 "pushover": "Pushover",
                 "pushy": "Pushy",
                 "rocket.chat": "Rocket.Chat",
-                "serwersms": "SerwerSMS.pl",
                 "signal": "Signal",
-                "SMSManager": "SmsManager (smsmanager.cz)",
                 "slack": "Slack",
                 "squadcast": "SquadCast",
                 "SMSEagle": "SMSEagle",
@@ -150,23 +145,51 @@ export default {
                 "telegram": "Telegram",
                 "Splunk": "Splunk",
                 "webhook": "Webhook",
-                "WeCom": "WeCom (企业微信群机器人)",
                 "GoAlert": "GoAlert",
-                "ServerChan": "ServerChan (Server酱)",
                 "ZohoCliq": "ZohoCliq"
             };
 
+            // Put notifications here if it's not supported in most regions or its documentation is not in English
+            let regionalList = {
+                "AliyunSMS": "AliyunSMS (阿里云短信服务)",
+                "DingDing": "DingDing (钉钉自定义机器人)",
+                "Feishu": "Feishu (飞书)",
+                "FreeMobile": "FreeMobile (mobile.free.fr)",
+                "PushDeer": "PushDeer",
+                "promosms": "PromoSMS",
+                "serwersms": "SerwerSMS.pl",
+                "SMSManager": "SmsManager (smsmanager.cz)",
+                "WeCom": "WeCom (企业微信群机器人)",
+                "ServerChan": "ServerChan (Server酱)",
+            };
+
             // Sort by notification name
             // No idea how, but it works
             // https://stackoverflow.com/questions/1069666/sorting-object-property-by-values
-            const sortable = Object.entries(list)
-                .sort(([ , a ], [ , b ]) => a - b)
-                .reduce((r, [ k, v ]) => ({
-                    ...r,
-                    [k]: v
-                }), {});
-
-            return sortable;
+            let sort = (list2) => {
+                return Object.entries(list2)
+                    .sort(([ , a ], [ , b ]) => a.localeCompare(b))
+                    .reduce((r, [ k, v ]) => ({
+                        ...r,
+                        [k]: v
+                    }), {});
+            };
+
+            return {
+                regularList: sort(regularList),
+                regionalList: sort(regionalList),
+            };
+        },
+
+        notificationFullNameList() {
+            let list = {};
+            for (let [ key, value ] of Object.entries(this.notificationNameList.regularList)) {
+                list[key] = value;
+            }
+            for (let [ key, value ] of Object.entries(this.notificationNameList.regionalList)) {
+                list[key] = value;
+            }
+            return list;
         },
     },
 
@@ -272,7 +295,7 @@ export default {
             let name = "";
             do {
                 name = this.$t("defaultNotificationName", {
-                    notification: this.notificationNameList[notificationKey].replace(/\(.+\)/, "").trim(),
+                    notification: this.notificationFullNameList[notificationKey].replace(/\(.+\)/, "").trim(),
                     number: index++
                 });
             } while (this.$root.notificationList.find(it => it.name === name));
diff --git a/src/lang/en.json b/src/lang/en.json
index cfbad0b6f8..de86111a1f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -432,6 +432,7 @@
     "uninstall": "Uninstall",
     "uninstalling": "Uninstalling",
     "confirmUninstallPlugin": "Are you sure want to uninstall this plugin?",
+    "notificationRegional": "Regional",
     "smtp": "Email (SMTP)",
     "secureOptionNone": "None / STARTTLS (25, 587)",
     "secureOptionTLS": "TLS (465)",