From 7f88aacbe735c3632a2d3664888e7a96f2c8e245 Mon Sep 17 00:00:00 2001
From: Thomas Spalinger <spali@spali.ch>
Date: Thu, 23 Feb 2023 16:16:49 +0000
Subject: [PATCH 01/45] make monitor start() and stop() async

---
 server/model/monitor.js |  4 ++--
 server/server.js        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 4bb859e9..c7388607 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -199,7 +199,7 @@ class Monitor extends BeanModel {
      * Start monitor
      * @param {Server} io Socket server instance
      */
-    start(io) {
+    async start(io) {
         let previousBeat = null;
         let retries = 0;
 
@@ -836,7 +836,7 @@ class Monitor extends BeanModel {
     }
 
     /** Stop monitor */
-    stop() {
+    async stop() {
         clearTimeout(this.heartbeatInterval);
         this.isStop = true;
 
diff --git a/server/server.js b/server/server.js
index 18598171..1dd012af 100644
--- a/server/server.js
+++ b/server/server.js
@@ -872,7 +872,7 @@ let needSetup = false;
                 log.info("manage", `Delete Monitor: ${monitorID} User ID: ${socket.userID}`);
 
                 if (monitorID in server.monitorList) {
-                    server.monitorList[monitorID].stop();
+                    await server.monitorList[monitorID].stop();
                     delete server.monitorList[monitorID];
                 }
 
@@ -1694,11 +1694,11 @@ async function startMonitor(userID, monitorID) {
     ]);
 
     if (monitor.id in server.monitorList) {
-        server.monitorList[monitor.id].stop();
+        await server.monitorList[monitor.id].stop();
     }
 
     server.monitorList[monitor.id] = monitor;
-    monitor.start(io);
+    await monitor.start(io);
 }
 
 /**
@@ -1728,7 +1728,7 @@ async function pauseMonitor(userID, monitorID) {
     ]);
 
     if (monitorID in server.monitorList) {
-        server.monitorList[monitorID].stop();
+        await server.monitorList[monitorID].stop();
     }
 }
 
@@ -1741,7 +1741,7 @@ async function startMonitors() {
     }
 
     for (let monitor of list) {
-        monitor.start(io);
+        await monitor.start(io);
         // Give some delays, so all monitors won't make request at the same moment when just start the server.
         await sleep(getRandomInt(300, 1000));
     }
@@ -1762,7 +1762,7 @@ async function shutdownFunction(signal) {
     log.info("server", "Stopping all monitors");
     for (let id in server.monitorList) {
         let monitor = server.monitorList[id];
-        monitor.stop();
+        await monitor.stop();
     }
     await sleep(2000);
     await Database.close();

From 20b69acde21a44c202215963a49912f395e84429 Mon Sep 17 00:00:00 2001
From: Philip Klostermann <pklostermann@elastalink.com>
Date: Tue, 23 Jan 2024 10:10:31 -0500
Subject: [PATCH 02/45] [Ntfy] Only include action link if monitor url is
 defined #3274

---
 server/notification-providers/ntfy.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 86fc0e08..b51b0f23 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -54,14 +54,17 @@ class Ntfy extends NotificationProvider {
                 "priority": priority,
                 "title": monitorJSON.name + " " + status + " [Uptime-Kuma]",
                 "tags": tags,
-                "actions": [
+            };
+
+            if (monitorJSON.url) {
+                data.actions = [
                     {
                         "action": "view",
                         "label": "Open " + monitorJSON.name,
                         "url": monitorJSON.url,
-                    }
-                ]
-            };
+                    },
+                ];
+            }
 
             if (notification.ntfyIcon) {
                 data.icon = notification.ntfyIcon;

From 95125cc4172c2d196f99748fc3dac06a9285bc75 Mon Sep 17 00:00:00 2001
From: Philip Klostermann <pklostermann@elastalink.com>
Date: Tue, 23 Jan 2024 11:16:10 -0500
Subject: [PATCH 03/45] [Ntfy] don't include url action with defaut URL value

---
 server/notification-providers/ntfy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index b51b0f23..12c9258b 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -56,7 +56,7 @@ class Ntfy extends NotificationProvider {
                 "tags": tags,
             };
 
-            if (monitorJSON.url) {
+            if (monitorJSON.url && monitorJSON.url !== "https://") {
                 data.actions = [
                     {
                         "action": "view",

From dc3abc68f0c90681727c7ea574a35f8588174108 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 30 Jan 2024 17:54:04 +0100
Subject: [PATCH 04/45] Fixed type anotation

---
 server/model/monitor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index 30c631a7..0c322b92 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -324,7 +324,7 @@ class Monitor extends BeanModel {
     /**
      * Start monitor
      * @param {Server} io Socket server instance
-     * @returns {void}
+     * @returns {Promise<void>}
      */
     async start(io) {
         let previousBeat = null;

From 93ac212aef23f8bdb8a64968ecb6a6ca5f704407 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 15:58:54 -0800
Subject: [PATCH 05/45] Add Heii On-Call

---
 server/notification-providers/heii-oncall.js |  68 +++++++++++
 server/notification.js                       |  40 ++++---
 src/components/NotificationDialog.vue        | 118 +++++++++++++++----
 src/components/notifications/HeiiOnCall.vue  |  35 ++++++
 src/components/notifications/index.js        | 108 ++++++++---------
 src/lang/en.json                             |   3 +-
 6 files changed, 283 insertions(+), 89 deletions(-)
 create mode 100644 server/notification-providers/heii-oncall.js
 create mode 100644 src/components/notifications/HeiiOnCall.vue

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
new file mode 100644
index 00000000..7babd907
--- /dev/null
+++ b/server/notification-providers/heii-oncall.js
@@ -0,0 +1,68 @@
+const { UP, DOWN, getMonitorRelativeURL } = require("../../src/util");
+const { setting } = require("../util-server");
+
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+const heiiOnCallBaseUrl = "http://192.168.2.1:3005";
+
+class HeiiOnCall extends NotificationProvider {
+    name = "HeiiOnCall";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        // Payload to Heii On-Call is the entire heartbat JSON
+        const payload = heartbeatJSON ? heartbeatJSON : {};
+
+        if (!heartbeatJSON) {
+            // Test button was clicked on Notification Setup, trigger the alert as a test
+            payload["message"] = "Testing UptimeKuma Trigger";
+            return this.postNotification(notification, "alert", payload);
+        }
+
+        // If we can add url back to mintor to payload
+        const baseURL = await setting("primaryBaseURL");
+        if (baseURL && monitorJSON) {
+            payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
+        }
+
+        if (heartbeatJSON.status === DOWN) {
+            // Monitor is DOWN, alert on Heii On-Call
+            return this.postNotification(notification, "alert", payload);
+        }
+
+        if (heartbeatJSON.status === UP) {
+            // Monitor is UP, resolve on Heii On-Call
+            return this.postNotification(notification, "resolve", payload);
+        }
+    }
+
+    /**
+     * Post to Heii On-Call
+     * @param {BeanModel} notification Message title
+     * @param {string} action Trigger Action (alert, resovle)
+     * @param {object} payload Data for Heii On-Call
+     * @returns {Promise<string>} Success message
+     */
+    async postNotification(notification, action, payload) {
+        const config = {
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                Authorization: "Bearer " + notification.heiiOnCallApiKey,
+            },
+        };
+
+        // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
+        await axios.post(
+            `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+            payload,
+            config
+        );
+        return "Sent Successfully.";
+    }
+}
+
+module.exports = HeiiOnCall;
diff --git a/server/notification.js b/server/notification.js
index 5e76d6eb..722cf90c 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -16,6 +16,7 @@ const Gorush = require("./notification-providers/gorush");
 const Gotify = require("./notification-providers/gotify");
 const GrafanaOncall = require("./notification-providers/grafana-oncall");
 const HomeAssistant = require("./notification-providers/home-assistant");
+const HeiiOnCall = require("./notification-providers/heii-oncall");
 const Kook = require("./notification-providers/kook");
 const Line = require("./notification-providers/line");
 const LineNotify = require("./notification-providers/linenotify");
@@ -56,7 +57,6 @@ const ServerChan = require("./notification-providers/serverchan");
 const ZohoCliq = require("./notification-providers/zoho-cliq");
 
 class Notification {
-
     providerList = {};
 
     /**
@@ -87,6 +87,7 @@ class Notification {
             new Gotify(),
             new GrafanaOncall(),
             new HomeAssistant(),
+            new HeiiOnCall(),
             new Kook(),
             new Line(),
             new LineNotify(),
@@ -124,10 +125,10 @@ class Notification {
             new Webhook(),
             new WeCom(),
             new GoAlert(),
-            new ZohoCliq()
+            new ZohoCliq(),
         ];
         for (let item of list) {
-            if (! item.name) {
+            if (!item.name) {
                 throw new Error("Notification provider without name");
             }
 
@@ -147,9 +148,19 @@ class Notification {
      * @returns {Promise<string>} Successful msg
      * @throws Error with fail msg
      */
-    static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+    static async send(
+        notification,
+        msg,
+        monitorJSON = null,
+        heartbeatJSON = null
+    ) {
         if (this.providerList[notification.type]) {
-            return this.providerList[notification.type].send(notification, msg, monitorJSON, heartbeatJSON);
+            return this.providerList[notification.type].send(
+                notification,
+                msg,
+                monitorJSON,
+                heartbeatJSON
+            );
         } else {
             throw new Error("Notification type is not supported");
         }
@@ -171,10 +182,9 @@ class Notification {
                 userID,
             ]);
 
-            if (! bean) {
+            if (!bean) {
                 throw new Error("notification not found");
             }
-
         } else {
             bean = R.dispense("notification");
         }
@@ -204,7 +214,7 @@ class Notification {
             userID,
         ]);
 
-        if (! bean) {
+        if (!bean) {
             throw new Error("notification not found");
         }
 
@@ -220,7 +230,6 @@ class Notification {
         let exists = commandExistsSync("apprise");
         return exists;
     }
-
 }
 
 /**
@@ -231,16 +240,17 @@ class Notification {
  */
 async function applyNotificationEveryMonitor(notificationID, userID) {
     let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
-        userID
+        userID,
     ]);
 
     for (let i = 0; i < monitors.length; i++) {
-        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
-            monitors[i].id,
-            notificationID,
-        ]);
+        let checkNotification = await R.findOne(
+            "monitor_notification",
+            " monitor_id = ? AND notification_id = ? ",
+            [monitors[i].id, notificationID]
+        );
 
-        if (! checkNotification) {
+        if (!checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 57a2fdf2..4a16fdf3 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -1,62 +1,132 @@
 <template>
     <form @submit.prevent="submit">
-        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
+        <div
+            ref="modal"
+            class="modal fade"
+            tabindex="-1"
+            data-bs-backdrop="static"
+        >
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Notification") }}
                         </h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
+                        <button
+                            type="button"
+                            class="btn-close"
+                            data-bs-dismiss="modal"
+                            aria-label="Close"
+                        />
                     </div>
                     <div class="modal-body">
                         <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.regularList" :key="type" :value="type">{{ name }}</option>
+                            <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.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>
+                                    <option
+                                        v-for="(
+                                            name, type
+                                        ) in notificationNameList.regionalList"
+                                        :key="type"
+                                        :value="type"
+                                    >
+                                        {{ name }}
+                                    </option>
                                 </optgroup>
                             </select>
                         </div>
 
                         <div class="mb-3">
-                            <label for="notification-name" class="form-label">{{ $t("Friendly Name") }}</label>
-                            <input id="notification-name" v-model="notification.name" type="text" class="form-control" required>
+                            <label for="notification-name" class="form-label">{{
+                                $t("Friendly Name")
+                            }}</label>
+                            <input
+                                id="notification-name"
+                                v-model="notification.name"
+                                type="text"
+                                class="form-control"
+                                required
+                            />
                         </div>
 
                         <!-- form body -->
                         <component :is="currentForm" />
 
                         <div class="mb-3 mt-4">
-                            <hr class="dropdown-divider mb-4">
+                            <hr class="dropdown-divider mb-4" />
 
                             <div class="form-check form-switch">
-                                <input v-model="notification.isDefault" class="form-check-input" type="checkbox">
-                                <label class="form-check-label">{{ $t("Default enabled") }}</label>
+                                <input
+                                    v-model="notification.isDefault"
+                                    class="form-check-input"
+                                    type="checkbox"
+                                />
+                                <label class="form-check-label">{{
+                                    $t("Default enabled")
+                                }}</label>
                             </div>
                             <div class="form-text">
                                 {{ $t("enableDefaultNotificationDescription") }}
                             </div>
 
-                            <br>
+                            <br />
 
                             <div class="form-check form-switch">
-                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
-                                <label class="form-check-label">{{ $t("Apply on all existing monitors") }}</label>
+                                <input
+                                    v-model="notification.applyExisting"
+                                    class="form-check-input"
+                                    type="checkbox"
+                                />
+                                <label class="form-check-label">{{
+                                    $t("Apply on all existing monitors")
+                                }}</label>
                             </div>
                         </div>
                     </div>
 
                     <div class="modal-footer">
-                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
+                        <button
+                            v-if="id"
+                            type="button"
+                            class="btn btn-danger"
+                            :disabled="processing"
+                            @click="deleteConfirm"
+                        >
                             {{ $t("Delete") }}
                         </button>
-                        <button type="button" class="btn btn-warning" :disabled="processing" @click="test">
+                        <button
+                            type="button"
+                            class="btn btn-warning"
+                            :disabled="processing"
+                            @click="test"
+                        >
                             {{ $t("Test") }}
                         </button>
-                        <button type="submit" class="btn btn-primary" :disabled="processing">
-                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            :disabled="processing"
+                        >
+                            <div
+                                v-if="processing"
+                                class="spinner-border spinner-border-sm me-1"
+                            ></div>
                             {{ $t("Save") }}
                         </button>
                     </div>
@@ -65,7 +135,13 @@
         </div>
     </form>
 
-    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteNotification">
+    <Confirm
+        ref="confirmDelete"
+        btn-style="btn-danger"
+        :yes-text="$t('Yes')"
+        :no-text="$t('No')"
+        @yes="deleteNotification"
+    >
         {{ $t("deleteNotificationMsg") }}
     </Confirm>
 </template>
@@ -121,6 +197,7 @@ export default {
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
                 "HomeAssistant": "Home Assistant",
+                "HeiiOnCall": "Heii On-Call",
                 "Kook": "Kook",
                 "line": "LINE Messenger",
                 "LineNotify": "LINE Notify",
@@ -330,7 +407,8 @@ export default {
 @import "../assets/vars.scss";
 
 .dark {
-    .modal-dialog .form-text, .modal-dialog p {
+    .modal-dialog .form-text,
+    .modal-dialog p {
         color: $dark-font-color;
     }
 }
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
new file mode 100644
index 00000000..f773dbae
--- /dev/null
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="mb-3">
+        <label for="heiioncall-apikey" class="form-label"
+            >{{ $t("API Key")
+            }}<span style="color: red"><sup>*</sup></span></label
+        >
+        <HiddenInput
+            id="heiioncall-apikey"
+            v-model="$parent.notification.heiiOnCallApiKey"
+            required="true"
+            autocomplete="false"
+        ></HiddenInput>
+    </div>
+    <div class="mb-3">
+        <label for="heiioncall-trigger-id" class="form-label"
+            >{{ $t("Trigger ID")
+            }}<span style="color: red"><sup>*</sup></span></label
+        >
+        <HiddenInput
+            id="heiioncall-trigger-id"
+            v-model="$parent.notification.heiiOnCallTriggerId"
+            required="true"
+            autocomplete="false"
+        ></HiddenInput>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 0606d41a..c71736a7 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -14,6 +14,7 @@ import Gorush from "./Gorush.vue";
 import Gotify from "./Gotify.vue";
 import GrafanaOncall from "./GrafanaOncall.vue";
 import HomeAssistant from "./HomeAssistant.vue";
+import HeiiOnCall from "./HeiiOnCall.vue";
 import Kook from "./Kook.vue";
 import Line from "./Line.vue";
 import LineNotify from "./LineNotify.vue";
@@ -58,60 +59,61 @@ import Splunk from "./Splunk.vue";
  * @type { Record<string, any> }
  */
 const NotificationFormList = {
-    "alerta": Alerta,
-    "AlertNow": AlertNow,
-    "AliyunSMS": AliyunSMS,
-    "apprise": Apprise,
-    "Bark": Bark,
-    "clicksendsms": ClickSendSMS,
-    "smsc": SMSC,
-    "DingDing": DingDing,
-    "discord": Discord,
-    "Feishu": Feishu,
-    "FreeMobile": FreeMobile,
-    "GoogleChat": GoogleChat,
-    "gorush": Gorush,
-    "gotify": Gotify,
-    "GrafanaOncall": GrafanaOncall,
-    "HomeAssistant": HomeAssistant,
-    "Kook": Kook,
-    "line": Line,
-    "LineNotify": LineNotify,
-    "lunasea": LunaSea,
-    "matrix": Matrix,
-    "mattermost": Mattermost,
-    "nostr": Nostr,
-    "ntfy": Ntfy,
-    "octopush": Octopush,
-    "OneBot": OneBot,
-    "Opsgenie": Opsgenie,
-    "PagerDuty": PagerDuty,
-    "FlashDuty": FlashDuty,
-    "PagerTree": PagerTree,
-    "promosms": PromoSMS,
-    "pushbullet": Pushbullet,
-    "PushByTechulus": TechulusPush,
-    "PushDeer": PushDeer,
-    "pushover": Pushover,
-    "pushy": Pushy,
+    alerta: Alerta,
+    AlertNow: AlertNow,
+    AliyunSMS: AliyunSMS,
+    apprise: Apprise,
+    Bark: Bark,
+    clicksendsms: ClickSendSMS,
+    smsc: SMSC,
+    DingDing: DingDing,
+    discord: Discord,
+    Feishu: Feishu,
+    FreeMobile: FreeMobile,
+    GoogleChat: GoogleChat,
+    gorush: Gorush,
+    gotify: Gotify,
+    GrafanaOncall: GrafanaOncall,
+    HomeAssistant: HomeAssistant,
+    HeiiOnCall: HeiiOnCall,
+    Kook: Kook,
+    line: Line,
+    LineNotify: LineNotify,
+    lunasea: LunaSea,
+    matrix: Matrix,
+    mattermost: Mattermost,
+    nostr: Nostr,
+    ntfy: Ntfy,
+    octopush: Octopush,
+    OneBot: OneBot,
+    Opsgenie: Opsgenie,
+    PagerDuty: PagerDuty,
+    FlashDuty: FlashDuty,
+    PagerTree: PagerTree,
+    promosms: PromoSMS,
+    pushbullet: Pushbullet,
+    PushByTechulus: TechulusPush,
+    PushDeer: PushDeer,
+    pushover: Pushover,
+    pushy: Pushy,
     "rocket.chat": RocketChat,
-    "serwersms": SerwerSMS,
-    "signal": Signal,
-    "SMSManager": SMSManager,
-    "slack": Slack,
-    "squadcast": Squadcast,
-    "SMSEagle": SMSEagle,
-    "smtp": STMP,
-    "stackfield": Stackfield,
-    "teams": Teams,
-    "telegram": Telegram,
-    "twilio": Twilio,
-    "Splunk": Splunk,
-    "webhook": Webhook,
-    "WeCom": WeCom,
-    "GoAlert": GoAlert,
-    "ServerChan": ServerChan,
-    "ZohoCliq": ZohoCliq
+    serwersms: SerwerSMS,
+    signal: Signal,
+    SMSManager: SMSManager,
+    slack: Slack,
+    squadcast: Squadcast,
+    SMSEagle: SMSEagle,
+    smtp: STMP,
+    stackfield: Stackfield,
+    teams: Teams,
+    telegram: Telegram,
+    twilio: Twilio,
+    Splunk: Splunk,
+    webhook: Webhook,
+    WeCom: WeCom,
+    GoAlert: GoAlert,
+    ServerChan: ServerChan,
+    ZohoCliq: ZohoCliq,
 };
 
 export default NotificationFormList;
diff --git a/src/lang/en.json b/src/lang/en.json
index 0f59e62a..c81403d0 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -883,5 +883,6 @@
     "deleteRemoteBrowserMessage": "Are you sure want to delete this Remote Browser for all monitors?",
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
-    "What is a Remote Browser?": "What is a Remote Browser?"
+    "What is a Remote Browser?": "What is a Remote Browser?",
+    "Trigger ID": "Trigger ID"
 }

From e8fada938675d5b7655291492d0d22382365737b Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:14:41 -0800
Subject: [PATCH 06/45] set url to heii on call prod

---
 server/notification-providers/heii-oncall.js | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 7babd907..6332fee8 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -4,7 +4,7 @@ const { setting } = require("../util-server");
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
-const heiiOnCallBaseUrl = "http://192.168.2.1:3005";
+const heiiOnCallBaseUrl = "https://heiioncall.com";
 
 class HeiiOnCall extends NotificationProvider {
     name = "HeiiOnCall";
@@ -22,7 +22,7 @@ class HeiiOnCall extends NotificationProvider {
             return this.postNotification(notification, "alert", payload);
         }
 
-        // If we can add url back to mintor to payload
+        // If we can, add url back to mintor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
@@ -42,7 +42,7 @@ class HeiiOnCall extends NotificationProvider {
     /**
      * Post to Heii On-Call
      * @param {BeanModel} notification Message title
-     * @param {string} action Trigger Action (alert, resovle)
+     * @param {string} action Trigger action (alert, resovle)
      * @param {object} payload Data for Heii On-Call
      * @returns {Promise<string>} Success message
      */
@@ -56,12 +56,17 @@ class HeiiOnCall extends NotificationProvider {
         };
 
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        await axios.post(
-            `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-            payload,
-            config
-        );
-        return "Sent Successfully.";
+        try {
+            await axios.post(
+                `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+                payload,
+                config
+            );
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+        return "Heii On-Call post sent successfully.";
     }
 }
 

From 80bdc455da6cd255ee95d5714ae803dab3bec8a2 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:31:58 -0800
Subject: [PATCH 07/45] lint

---
 server/notification.js                      |  2 +-
 src/components/notifications/HeiiOnCall.vue | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/server/notification.js b/server/notification.js
index 722cf90c..71310b00 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -247,7 +247,7 @@ async function applyNotificationEveryMonitor(notificationID, userID) {
         let checkNotification = await R.findOne(
             "monitor_notification",
             " monitor_id = ? AND notification_id = ? ",
-            [monitors[i].id, notificationID]
+            [ monitors[i].id, notificationID ]
         );
 
         if (!checkNotification) {
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index f773dbae..64c0a9e0 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="mb-3">
-        <label for="heiioncall-apikey" class="form-label"
-            >{{ $t("API Key")
-            }}<span style="color: red"><sup>*</sup></span></label
-        >
+        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
+        }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-apikey"
             v-model="$parent.notification.heiiOnCallApiKey"
@@ -12,10 +10,8 @@
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label"
-            >{{ $t("Trigger ID")
-            }}<span style="color: red"><sup>*</sup></span></label
-        >
+        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
+        }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-trigger-id"
             v-model="$parent.notification.heiiOnCallTriggerId"

From 10659d07b261fc0542c5584d0429b7101fb8266e Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 16:56:41 -0800
Subject: [PATCH 08/45] add link to documentation explaining how to get id and
 token

---
 src/components/notifications/HeiiOnCall.vue |  13 +--
 src/components/notifications/index.js       | 108 ++++++++++----------
 src/lang/en.json                            |   5 +-
 3 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 64c0a9e0..e09eae2f 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -3,9 +3,7 @@
         <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
         }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
-            id="heiioncall-apikey"
-            v-model="$parent.notification.heiiOnCallApiKey"
-            required="true"
+            id="heiioncall-apikey" v-model="$parent.notification.heiiOnCallApiKey" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
@@ -13,12 +11,15 @@
         <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
         }}<span style="color: red"><sup>*</sup></span></label>
         <HiddenInput
-            id="heiioncall-trigger-id"
-            v-model="$parent.notification.heiiOnCallTriggerId"
-            required="true"
+            id="heiioncall-trigger-id" v-model="$parent.notification.heiiOnCallTriggerId" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
+    <div class="form-text">
+        <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
+            <a href="https://heiioncall.com/docs" target="_blank">Heii On-Call Documentation</a>
+        </i18n-t>
+    </div>
 </template>
 
 <script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index c71736a7..6cb0c9fd 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -59,61 +59,61 @@ import Splunk from "./Splunk.vue";
  * @type { Record<string, any> }
  */
 const NotificationFormList = {
-    alerta: Alerta,
-    AlertNow: AlertNow,
-    AliyunSMS: AliyunSMS,
-    apprise: Apprise,
-    Bark: Bark,
-    clicksendsms: ClickSendSMS,
-    smsc: SMSC,
-    DingDing: DingDing,
-    discord: Discord,
-    Feishu: Feishu,
-    FreeMobile: FreeMobile,
-    GoogleChat: GoogleChat,
-    gorush: Gorush,
-    gotify: Gotify,
-    GrafanaOncall: GrafanaOncall,
-    HomeAssistant: HomeAssistant,
-    HeiiOnCall: HeiiOnCall,
-    Kook: Kook,
-    line: Line,
-    LineNotify: LineNotify,
-    lunasea: LunaSea,
-    matrix: Matrix,
-    mattermost: Mattermost,
-    nostr: Nostr,
-    ntfy: Ntfy,
-    octopush: Octopush,
-    OneBot: OneBot,
-    Opsgenie: Opsgenie,
-    PagerDuty: PagerDuty,
-    FlashDuty: FlashDuty,
-    PagerTree: PagerTree,
-    promosms: PromoSMS,
-    pushbullet: Pushbullet,
-    PushByTechulus: TechulusPush,
-    PushDeer: PushDeer,
-    pushover: Pushover,
-    pushy: Pushy,
+    "alerta": Alerta,
+    "AlertNow": AlertNow,
+    "AliyunSMS": AliyunSMS,
+    "apprise": Apprise,
+    "Bark": Bark,
+    "clicksendsms": ClickSendSMS,
+    "smsc": SMSC,
+    "DingDing": DingDing,
+    "discord": Discord,
+    "Feishu": Feishu,
+    "FreeMobile": FreeMobile,
+    "GoogleChat": GoogleChat,
+    "gorush": Gorush,
+    "gotify": Gotify,
+    "GrafanaOncall": GrafanaOncall,
+    "HomeAssistant": HomeAssistant,
+    "HeiiOnCall": HeiiOnCall,
+    "Kook": Kook,
+    "line": Line,
+    "LineNotify": LineNotify,
+    "lunasea": LunaSea,
+    "matrix": Matrix,
+    "mattermost": Mattermost,
+    "nostr": Nostr,
+    "ntfy": Ntfy,
+    "octopush": Octopush,
+    "OneBot": OneBot,
+    "Opsgenie": Opsgenie,
+    "PagerDuty": PagerDuty,
+    "FlashDuty": FlashDuty,
+    "PagerTree": PagerTree,
+    "promosms": PromoSMS,
+    "pushbullet": Pushbullet,
+    "PushByTechulus": TechulusPush,
+    "PushDeer": PushDeer,
+    "pushover": Pushover,
+    "pushy": Pushy,
     "rocket.chat": RocketChat,
-    serwersms: SerwerSMS,
-    signal: Signal,
-    SMSManager: SMSManager,
-    slack: Slack,
-    squadcast: Squadcast,
-    SMSEagle: SMSEagle,
-    smtp: STMP,
-    stackfield: Stackfield,
-    teams: Teams,
-    telegram: Telegram,
-    twilio: Twilio,
-    Splunk: Splunk,
-    webhook: Webhook,
-    WeCom: WeCom,
-    GoAlert: GoAlert,
-    ServerChan: ServerChan,
-    ZohoCliq: ZohoCliq,
+    "serwersms": SerwerSMS,
+    "signal": Signal,
+    "SMSManager": SMSManager,
+    "slack": Slack,
+    "squadcast": Squadcast,
+    "SMSEagle": SMSEagle,
+    "smtp": STMP,
+    "stackfield": Stackfield,
+    "teams": Teams,
+    "telegram": Telegram,
+    "twilio": Twilio,
+    "Splunk": Splunk,
+    "webhook": Webhook,
+    "WeCom": WeCom,
+    "GoAlert": GoAlert,
+    "ServerChan": ServerChan,
+    "ZohoCliq": ZohoCliq
 };
 
 export default NotificationFormList;
diff --git a/src/lang/en.json b/src/lang/en.json
index c81403d0..4678003a 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,5 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "Trigger ID": "Trigger ID"
-}
+    "Trigger ID": "Trigger ID",
+    "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
+}
\ No newline at end of file

From 246316f55b178449ef99ac6ef8bf1ecb07d87386 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:24:42 -0800
Subject: [PATCH 09/45] Undo my overzelous linter

---
 server/notification.js                |  38 ++++-----
 src/components/NotificationDialog.vue | 118 +++++---------------------
 2 files changed, 35 insertions(+), 121 deletions(-)

diff --git a/server/notification.js b/server/notification.js
index 71310b00..5a412c6e 100644
--- a/server/notification.js
+++ b/server/notification.js
@@ -57,6 +57,7 @@ const ServerChan = require("./notification-providers/serverchan");
 const ZohoCliq = require("./notification-providers/zoho-cliq");
 
 class Notification {
+
     providerList = {};
 
     /**
@@ -125,10 +126,10 @@ class Notification {
             new Webhook(),
             new WeCom(),
             new GoAlert(),
-            new ZohoCliq(),
+            new ZohoCliq()
         ];
         for (let item of list) {
-            if (!item.name) {
+            if (! item.name) {
                 throw new Error("Notification provider without name");
             }
 
@@ -148,19 +149,9 @@ class Notification {
      * @returns {Promise<string>} Successful msg
      * @throws Error with fail msg
      */
-    static async send(
-        notification,
-        msg,
-        monitorJSON = null,
-        heartbeatJSON = null
-    ) {
+    static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         if (this.providerList[notification.type]) {
-            return this.providerList[notification.type].send(
-                notification,
-                msg,
-                monitorJSON,
-                heartbeatJSON
-            );
+            return this.providerList[notification.type].send(notification, msg, monitorJSON, heartbeatJSON);
         } else {
             throw new Error("Notification type is not supported");
         }
@@ -182,9 +173,10 @@ class Notification {
                 userID,
             ]);
 
-            if (!bean) {
+            if (! bean) {
                 throw new Error("notification not found");
             }
+
         } else {
             bean = R.dispense("notification");
         }
@@ -214,7 +206,7 @@ class Notification {
             userID,
         ]);
 
-        if (!bean) {
+        if (! bean) {
             throw new Error("notification not found");
         }
 
@@ -230,6 +222,7 @@ class Notification {
         let exists = commandExistsSync("apprise");
         return exists;
     }
+
 }
 
 /**
@@ -240,17 +233,16 @@ class Notification {
  */
 async function applyNotificationEveryMonitor(notificationID, userID) {
     let monitors = await R.getAll("SELECT id FROM monitor WHERE user_id = ?", [
-        userID,
+        userID
     ]);
 
     for (let i = 0; i < monitors.length; i++) {
-        let checkNotification = await R.findOne(
-            "monitor_notification",
-            " monitor_id = ? AND notification_id = ? ",
-            [ monitors[i].id, notificationID ]
-        );
+        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
+            monitors[i].id,
+            notificationID,
+        ]);
 
-        if (!checkNotification) {
+        if (! checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;
diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 4a16fdf3..57a2fdf2 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -1,132 +1,62 @@
 <template>
     <form @submit.prevent="submit">
-        <div
-            ref="modal"
-            class="modal fade"
-            tabindex="-1"
-            data-bs-backdrop="static"
-        >
+        <div ref="modal" class="modal fade" tabindex="-1" data-bs-backdrop="static">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 id="exampleModalLabel" class="modal-title">
                             {{ $t("Setup Notification") }}
                         </h5>
-                        <button
-                            type="button"
-                            class="btn-close"
-                            data-bs-dismiss="modal"
-                            aria-label="Close"
-                        />
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" />
                     </div>
                     <div class="modal-body">
                         <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.regularList"
-                                    :key="type"
-                                    :value="type"
-                                >
-                                    {{ name }}
-                                </option>
+                            <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.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>
+                                    <option v-for="(name, type) in notificationNameList.regionalList" :key="type" :value="type">{{ name }}</option>
                                 </optgroup>
                             </select>
                         </div>
 
                         <div class="mb-3">
-                            <label for="notification-name" class="form-label">{{
-                                $t("Friendly Name")
-                            }}</label>
-                            <input
-                                id="notification-name"
-                                v-model="notification.name"
-                                type="text"
-                                class="form-control"
-                                required
-                            />
+                            <label for="notification-name" class="form-label">{{ $t("Friendly Name") }}</label>
+                            <input id="notification-name" v-model="notification.name" type="text" class="form-control" required>
                         </div>
 
                         <!-- form body -->
                         <component :is="currentForm" />
 
                         <div class="mb-3 mt-4">
-                            <hr class="dropdown-divider mb-4" />
+                            <hr class="dropdown-divider mb-4">
 
                             <div class="form-check form-switch">
-                                <input
-                                    v-model="notification.isDefault"
-                                    class="form-check-input"
-                                    type="checkbox"
-                                />
-                                <label class="form-check-label">{{
-                                    $t("Default enabled")
-                                }}</label>
+                                <input v-model="notification.isDefault" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Default enabled") }}</label>
                             </div>
                             <div class="form-text">
                                 {{ $t("enableDefaultNotificationDescription") }}
                             </div>
 
-                            <br />
+                            <br>
 
                             <div class="form-check form-switch">
-                                <input
-                                    v-model="notification.applyExisting"
-                                    class="form-check-input"
-                                    type="checkbox"
-                                />
-                                <label class="form-check-label">{{
-                                    $t("Apply on all existing monitors")
-                                }}</label>
+                                <input v-model="notification.applyExisting" class="form-check-input" type="checkbox">
+                                <label class="form-check-label">{{ $t("Apply on all existing monitors") }}</label>
                             </div>
                         </div>
                     </div>
 
                     <div class="modal-footer">
-                        <button
-                            v-if="id"
-                            type="button"
-                            class="btn btn-danger"
-                            :disabled="processing"
-                            @click="deleteConfirm"
-                        >
+                        <button v-if="id" type="button" class="btn btn-danger" :disabled="processing" @click="deleteConfirm">
                             {{ $t("Delete") }}
                         </button>
-                        <button
-                            type="button"
-                            class="btn btn-warning"
-                            :disabled="processing"
-                            @click="test"
-                        >
+                        <button type="button" class="btn btn-warning" :disabled="processing" @click="test">
                             {{ $t("Test") }}
                         </button>
-                        <button
-                            type="submit"
-                            class="btn btn-primary"
-                            :disabled="processing"
-                        >
-                            <div
-                                v-if="processing"
-                                class="spinner-border spinner-border-sm me-1"
-                            ></div>
+                        <button type="submit" class="btn btn-primary" :disabled="processing">
+                            <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
                             {{ $t("Save") }}
                         </button>
                     </div>
@@ -135,13 +65,7 @@
         </div>
     </form>
 
-    <Confirm
-        ref="confirmDelete"
-        btn-style="btn-danger"
-        :yes-text="$t('Yes')"
-        :no-text="$t('No')"
-        @yes="deleteNotification"
-    >
+    <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteNotification">
         {{ $t("deleteNotificationMsg") }}
     </Confirm>
 </template>
@@ -197,7 +121,6 @@ export default {
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
                 "HomeAssistant": "Home Assistant",
-                "HeiiOnCall": "Heii On-Call",
                 "Kook": "Kook",
                 "line": "LINE Messenger",
                 "LineNotify": "LINE Notify",
@@ -407,8 +330,7 @@ export default {
 @import "../assets/vars.scss";
 
 .dark {
-    .modal-dialog .form-text,
-    .modal-dialog p {
+    .modal-dialog .form-text, .modal-dialog p {
         color: $dark-font-color;
     }
 }

From 92488290fac16309e91ca269401df95f4a0a1200 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:38:50 -0800
Subject: [PATCH 10/45] add newline at end of file

---
 src/lang/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 4678003a..b8c1affa 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -886,4 +886,5 @@
     "What is a Remote Browser?": "What is a Remote Browser?",
     "Trigger ID": "Trigger ID",
     "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
-}
\ No newline at end of file
+}
+

From 5f25a75f656467f387f41c9b5d77afef7415fdc3 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:39:41 -0800
Subject: [PATCH 11/45] remove line at end of file

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

diff --git a/src/lang/en.json b/src/lang/en.json
index b8c1affa..9fa64d8d 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -887,4 +887,3 @@
     "Trigger ID": "Trigger ID",
     "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
 }
-

From 09d249ca36077f44f37b8c85a11dc6eff7136fc2 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:48:53 -0800
Subject: [PATCH 12/45] add form to NotificationDialog

---
 src/components/NotificationDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
index 57a2fdf2..56580fbf 100644
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@@ -120,6 +120,7 @@ export default {
                 "gorush": "Gorush",
                 "gotify": "Gotify",
                 "GrafanaOncall": "Grafana Oncall",
+                "HeiiOnCall": "Heii On-Call",
                 "HomeAssistant": "Home Assistant",
                 "Kook": "Kook",
                 "line": "LINE Messenger",

From 71dd5e2369911035ebaa38f7b55d525583aa81b8 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 17:54:36 -0800
Subject: [PATCH 13/45] do not assume missing heartbeat is a test

---
 server/notification-providers/heii-oncall.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 6332fee8..7e6bec20 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -16,18 +16,18 @@ class HeiiOnCall extends NotificationProvider {
         // Payload to Heii On-Call is the entire heartbat JSON
         const payload = heartbeatJSON ? heartbeatJSON : {};
 
-        if (!heartbeatJSON) {
-            // Test button was clicked on Notification Setup, trigger the alert as a test
-            payload["message"] = "Testing UptimeKuma Trigger";
-            return this.postNotification(notification, "alert", payload);
-        }
-
         // If we can, add url back to mintor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
+        if (!heartbeatJSON) {
+            // No heartbeatJSON. Could be test button, but not necessarily. Just pull msg into payload.
+            payload["msg"] = msg;
+            return this.postNotification(notification, "alert", payload);
+        }
+
         if (heartbeatJSON.status === DOWN) {
             // Monitor is DOWN, alert on Heii On-Call
             return this.postNotification(notification, "alert", payload);

From f254940b64430902e5f4c196687056be9eaf7553 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 18:01:06 -0800
Subject: [PATCH 14/45] spell things correctly

---
 server/notification-providers/heii-oncall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 7e6bec20..f31bc4ac 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -16,7 +16,7 @@ class HeiiOnCall extends NotificationProvider {
         // Payload to Heii On-Call is the entire heartbat JSON
         const payload = heartbeatJSON ? heartbeatJSON : {};
 
-        // If we can, add url back to mintor to payload
+        // If we can, add url back to monitor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);

From 673f9a7744d1bb7b73edaf065db951beeede7000 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 12 Feb 2024 18:12:07 -0800
Subject: [PATCH 15/45] get the linter to be happy with my vue file

---
 src/components/notifications/HeiiOnCall.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index e09eae2f..85fb91b6 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -1,15 +1,17 @@
 <template>
     <div class="mb-3">
-        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key")
-        }}<span style="color: red"><sup>*</sup></span></label>
+        <label for="heiioncall-apikey" class="form-label">{{ $t("API Key") }}<span
+            style="color: red;"
+        ><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-apikey" v-model="$parent.notification.heiiOnCallApiKey" required="true"
             autocomplete="false"
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID")
-        }}<span style="color: red"><sup>*</sup></span></label>
+        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID") }}<span
+            style="color: red;"
+        ><sup>*</sup></span></label>
         <HiddenInput
             id="heiioncall-trigger-id" v-model="$parent.notification.heiiOnCallTriggerId" required="true"
             autocomplete="false"

From 4cdc8f344bf83be9c1f206b91f6d9a58faa1f8a3 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Tue, 13 Feb 2024 16:54:52 -0800
Subject: [PATCH 16/45] Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 server/notification-providers/heii-oncall.js | 15 ++++-----------
 src/components/notifications/HeiiOnCall.vue  |  2 +-
 src/lang/en.json                             |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index f31bc4ac..75ebf614 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -3,9 +3,6 @@ const { setting } = require("../util-server");
 
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-
-const heiiOnCallBaseUrl = "https://heiioncall.com";
-
 class HeiiOnCall extends NotificationProvider {
     name = "HeiiOnCall";
 
@@ -13,28 +10,24 @@ class HeiiOnCall extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        // Payload to Heii On-Call is the entire heartbat JSON
-        const payload = heartbeatJSON ? heartbeatJSON : {};
+        const payload = heartbeatJSON || {};
 
-        // If we can, add url back to monitor to payload
         const baseURL = await setting("primaryBaseURL");
         if (baseURL && monitorJSON) {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
         if (!heartbeatJSON) {
-            // No heartbeatJSON. Could be test button, but not necessarily. Just pull msg into payload.
+            // Testing or general notification like certificate expiry
             payload["msg"] = msg;
             return this.postNotification(notification, "alert", payload);
         }
 
         if (heartbeatJSON.status === DOWN) {
-            // Monitor is DOWN, alert on Heii On-Call
             return this.postNotification(notification, "alert", payload);
         }
 
         if (heartbeatJSON.status === UP) {
-            // Monitor is UP, resolve on Heii On-Call
             return this.postNotification(notification, "resolve", payload);
         }
     }
@@ -58,7 +51,7 @@ class HeiiOnCall extends NotificationProvider {
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
         try {
             await axios.post(
-                `${heiiOnCallBaseUrl}/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+                `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
                 payload,
                 config
             );
@@ -66,7 +59,7 @@ class HeiiOnCall extends NotificationProvider {
             this.throwGeneralAxiosError(error);
         }
 
-        return "Heii On-Call post sent successfully.";
+        return "Sent Successfully";
     }
 }
 
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 85fb91b6..54c99134 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -19,7 +19,7 @@
     </div>
     <div class="form-text">
         <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
-            <a href="https://heiioncall.com/docs" target="_blank">Heii On-Call Documentation</a>
+            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
         </i18n-t>
     </div>
 </template>
diff --git a/src/lang/en.json b/src/lang/en.json
index 9fa64d8d..e95dc56c 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -885,5 +885,5 @@
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
     "Trigger ID": "Trigger ID",
-    "wayToGetHeiiOnCallDetails": "To get a Heii On-Call Tigger ID and Api Token visit: {0}"
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}"
 }

From 5a9c3ad353c57e098c1a683b673f840ecd31081b Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Tue, 13 Feb 2024 17:27:59 -0800
Subject: [PATCH 17/45] move try/catch into main control flow and more from
 code review comments

---
 server/notification-providers/heii-oncall.js | 39 ++++++++++----------
 src/components/notifications/HeiiOnCall.vue  | 10 ++---
 src/lang/en.json                             |  4 +-
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 75ebf614..585fa138 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -17,19 +17,24 @@ class HeiiOnCall extends NotificationProvider {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
-        if (!heartbeatJSON) {
-            // Testing or general notification like certificate expiry
-            payload["msg"] = msg;
-            return this.postNotification(notification, "alert", payload);
-        }
+        try {
+            if (!heartbeatJSON) {
+                // Testing or general notification like certificate expiry
+                payload["msg"] = msg;
+                return this.postNotification(notification, "alert", payload);
+            }
 
-        if (heartbeatJSON.status === DOWN) {
-            return this.postNotification(notification, "alert", payload);
-        }
+            if (heartbeatJSON.status === DOWN) {
+                return this.postNotification(notification, "alert", payload);
+            }
 
-        if (heartbeatJSON.status === UP) {
-            return this.postNotification(notification, "resolve", payload);
+            if (heartbeatJSON.status === UP) {
+                return this.postNotification(notification, "resolve", payload);
+            }
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
         }
+
     }
 
     /**
@@ -49,15 +54,11 @@ class HeiiOnCall extends NotificationProvider {
         };
 
         // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        try {
-            await axios.post(
-                `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-                payload,
-                config
-            );
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
+        await axios.post(
+            `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
+            payload,
+            config
+        );
 
         return "Sent Successfully";
     }
diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 54c99134..7ae516c7 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -9,7 +9,7 @@
         ></HiddenInput>
     </div>
     <div class="mb-3">
-        <label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID") }}<span
+        <label for="heiioncall-trigger-id" class="form-label">Trigger ID<span
             style="color: red;"
         ><sup>*</sup></span></label>
         <HiddenInput
@@ -17,11 +17,9 @@
             autocomplete="false"
         ></HiddenInput>
     </div>
-    <div class="form-text">
-        <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;">
-            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
-        </i18n-t>
-    </div>
+    <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" class="form-text mt-3">
+        <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+    </i18n-t>
 </template>
 
 <script>
diff --git a/src/lang/en.json b/src/lang/en.json
index e95dc56c..c0fd304a 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "Trigger ID": "Trigger ID",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}"
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {0}",
+    "documentationOf": "{0} Documentation"
 }

From cc000117ca9b8f888c69a31b9c8f2841b79bab7f Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Wed, 14 Feb 2024 23:41:35 +0100
Subject: [PATCH 18/45] Updated the code to look more like the other
 notification providers

---
 server/notification-providers/heii-oncall.js | 49 +++++++-------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 585fa138..87b9e3b3 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -10,6 +10,7 @@ class HeiiOnCall extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
         const payload = heartbeatJSON || {};
 
         const baseURL = await setting("primaryBaseURL");
@@ -17,50 +18,36 @@ class HeiiOnCall extends NotificationProvider {
             payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
         }
 
+        const config = {
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json",
+                Authorization: "Bearer " + notification.heiiOnCallApiKey,
+            },
+        };
+        
+        const heiiUrl = `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/`;
+        
+        // docs https://heiioncall.com/docs#manual-triggers
         try {
             if (!heartbeatJSON) {
                 // Testing or general notification like certificate expiry
                 payload["msg"] = msg;
-                return this.postNotification(notification, "alert", payload);
+                await axios.post(heiiUrl + "alert", payload, config);
+                return okMsg;
             }
 
             if (heartbeatJSON.status === DOWN) {
-                return this.postNotification(notification, "alert", payload);
+                await axios.post(heiiUrl + "alert", payload, config);
+                return okMsg;
             }
-
             if (heartbeatJSON.status === UP) {
-                return this.postNotification(notification, "resolve", payload);
+                await axios.post(heiiUrl + "resolve",payload, config);
+                return okMsg;
             }
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
-
-    }
-
-    /**
-     * Post to Heii On-Call
-     * @param {BeanModel} notification Message title
-     * @param {string} action Trigger action (alert, resovle)
-     * @param {object} payload Data for Heii On-Call
-     * @returns {Promise<string>} Success message
-     */
-    async postNotification(notification, action, payload) {
-        const config = {
-            headers: {
-                Accept: "application/json",
-                "Content-Type": "application/json",
-                Authorization: "Bearer " + notification.heiiOnCallApiKey,
-            },
-        };
-
-        // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
-        await axios.post(
-            `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
-            payload,
-            config
-        );
-
-        return "Sent Successfully";
     }
 }
 

From 1fdb7e48ed7881f2e64d43a964f70ee2795dca06 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Wed, 14 Feb 2024 23:45:23 +0100
Subject: [PATCH 19/45] Formatting fixes

---
 server/notification-providers/heii-oncall.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/notification-providers/heii-oncall.js b/server/notification-providers/heii-oncall.js
index 87b9e3b3..20b53e6a 100644
--- a/server/notification-providers/heii-oncall.js
+++ b/server/notification-providers/heii-oncall.js
@@ -25,9 +25,7 @@ class HeiiOnCall extends NotificationProvider {
                 Authorization: "Bearer " + notification.heiiOnCallApiKey,
             },
         };
-        
         const heiiUrl = `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/`;
-        
         // docs https://heiioncall.com/docs#manual-triggers
         try {
             if (!heartbeatJSON) {
@@ -42,7 +40,7 @@ class HeiiOnCall extends NotificationProvider {
                 return okMsg;
             }
             if (heartbeatJSON.status === UP) {
-                await axios.post(heiiUrl + "resolve",payload, config);
+                await axios.post(heiiUrl + "resolve", payload, config);
                 return okMsg;
             }
         } catch (error) {

From 9a52a8761cb017cced66ab3025be3d5cf2c26a42 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Fri, 16 Feb 2024 15:08:59 -0700
Subject: [PATCH 20/45] Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 src/components/notifications/HeiiOnCall.vue | 4 +++-
 src/lang/en.json                            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/notifications/HeiiOnCall.vue b/src/components/notifications/HeiiOnCall.vue
index 7ae516c7..a61c1c32 100644
--- a/src/components/notifications/HeiiOnCall.vue
+++ b/src/components/notifications/HeiiOnCall.vue
@@ -18,7 +18,9 @@
         ></HiddenInput>
     </div>
     <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" class="form-text mt-3">
-        <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+        <template #documentation>
+            <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
+        </template>
     </i18n-t>
 </template>
 
diff --git a/src/lang/en.json b/src/lang/en.json
index c0fd304a..9e495a68 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {0}",
+    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}",
     "documentationOf": "{0} Documentation"
 }

From 1b293f2754413e391b8339540e46132796a886ba Mon Sep 17 00:00:00 2001
From: Stefan Heine <stheine@arcor.de>
Date: Mon, 19 Feb 2024 07:42:37 +0100
Subject: [PATCH 21/45] MQTT monitor, set the MQTT clientId to make it easier
 in the MQTT broker to identify where the connections are coming from

---
 server/monitor-types/mqtt.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index cff5c93d..d9aaf964 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -81,7 +81,8 @@ class MqttMonitorType extends MonitorType {
 
             let client = mqtt.connect(mqttUrl, {
                 username,
-                password
+                password,
+                clientId: 'uptime-kuma_' + Math.random().toString(16).substr(2, 8)
             });
 
             client.on("connect", () => {

From 6bfc58674a2304ec8994005da87854635ed01734 Mon Sep 17 00:00:00 2001
From: Stefan Heine <stheine@arcor.de>
Date: Mon, 19 Feb 2024 07:57:34 +0100
Subject: [PATCH 22/45] MQTT monitor, set the MQTT clientId to make it easier
 in the MQTT broker to identify where the connections are coming from

---
 server/monitor-types/mqtt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/monitor-types/mqtt.js b/server/monitor-types/mqtt.js
index d9aaf964..9b2db43d 100644
--- a/server/monitor-types/mqtt.js
+++ b/server/monitor-types/mqtt.js
@@ -82,7 +82,7 @@ class MqttMonitorType extends MonitorType {
             let client = mqtt.connect(mqttUrl, {
                 username,
                 password,
-                clientId: 'uptime-kuma_' + Math.random().toString(16).substr(2, 8)
+                clientId: "uptime-kuma_" + Math.random().toString(16).substr(2, 8)
             });
 
             client.on("connect", () => {

From 99dccd9e902a9b49abaffb90f3dacd95f9c02ab3 Mon Sep 17 00:00:00 2001
From: Huzaifa Azim <huzaifaazim0@gmail.com>
Date: Fri, 23 Feb 2024 18:10:09 +0500
Subject: [PATCH 23/45] reset-password-issue-4518

---
 extra/reset-password.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extra/reset-password.js b/extra/reset-password.js
index 3b40e93e..b87d90f1 100644
--- a/extra/reset-password.js
+++ b/extra/reset-password.js
@@ -8,6 +8,7 @@ const User = require("../server/model/user");
 const { io } = require("socket.io-client");
 const { localWebSocketURL } = require("../server/config");
 const args = require("args-parser")(process.argv);
+
 const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -19,10 +20,10 @@ const main = async () => {
     }
 
     console.log("Connecting the database");
-    Database.initDataDir(args);
-    await Database.connect(false, false, true);
 
     try {
+        Database.initDataDir(args);
+        await Database.connect(false, false, true);
         // No need to actually reset the password for testing, just make sure no connection problem. It is ok for now.
         if (!process.env.TEST_BACKEND) {
             const user = await R.findOne("user");

From e74d6a7471d80ecb52b5ee4567eda1faf658deab Mon Sep 17 00:00:00 2001
From: Vista2003 <55105920+Vista2003@users.noreply.github.com>
Date: Sun, 25 Feb 2024 10:35:32 +0000
Subject: [PATCH 24/45] Fixing strings as reported on issue #4526

---
 src/components/notifications/Line.vue | 6 +++---
 src/lang/en.json                      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index dcd6142b..3ef51ca2 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -4,14 +4,14 @@
         <HiddenInput id="line-channel-access-token" v-model="$parent.notification.lineChannelAccessToken" :required="true" autocomplete="new-password"></HiddenInput>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
-        <b>{{ $t("Basic Settings") }}</b>
+        <b>{{ $t("Messaging API") }}</b>
     </i18n-t>
     <div class="mb-3" style="margin-top: 12px;">
-        <label for="line-user-id" class="form-label">{{ $t("User ID") }}</label>
+        <label for="line-user-id" class="form-label">{{ $t("Your User ID") }}</label>
         <input id="line-user-id" v-model="$parent.notification.lineUserID" type="text" class="form-control" required>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
-        <b>{{ $t("Messaging API") }}</b>
+        <b>{{ $t("Basic Settings") }}</b> 
     </i18n-t>
     <i18n-t tag="div" keypath="wayToGetLineChannelToken" class="form-text" style="margin-top: 8px;">
         <a href="https://developers.line.biz/console/" target="_blank">{{ $t("Line Developers Console") }}</a>
diff --git a/src/lang/en.json b/src/lang/en.json
index 0f59e62a..418ac58f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -536,6 +536,7 @@
     "lineDevConsoleTo": "Line Developers Console - {0}",
     "Basic Settings": "Basic Settings",
     "User ID": "User ID",
+    "Your User ID": "Your user ID",
     "Messaging API": "Messaging API",
     "wayToGetLineChannelToken": "First access the {0}, create a provider and channel (Messaging API), then you can get the channel access token and user ID from the above mentioned menu items.",
     "Icon URL": "Icon URL",

From 3fd0c822d639d5fceab91576413a429a0bd649e8 Mon Sep 17 00:00:00 2001
From: Vista2003 <55105920+Vista2003@users.noreply.github.com>
Date: Sun, 25 Feb 2024 16:31:25 +0000
Subject: [PATCH 25/45] Removed trailing space

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

diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index 3ef51ca2..d14e13b9 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -11,7 +11,7 @@
         <input id="line-user-id" v-model="$parent.notification.lineUserID" type="text" class="form-control" required>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
-        <b>{{ $t("Basic Settings") }}</b> 
+        <b>{{ $t("Basic Settings") }}</b>
     </i18n-t>
     <i18n-t tag="div" keypath="wayToGetLineChannelToken" class="form-text" style="margin-top: 8px;">
         <a href="https://developers.line.biz/console/" target="_blank">{{ $t("Line Developers Console") }}</a>

From 800847d0df63a2e2b72fa57332c447825c537705 Mon Sep 17 00:00:00 2001
From: Vista2003 <55105920+Vista2003@users.noreply.github.com>
Date: Mon, 26 Feb 2024 20:23:57 +0000
Subject: [PATCH 26/45] Correcting label to fit what it says on the page

---
 src/components/notifications/Line.vue | 2 +-
 src/lang/en.json                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index d14e13b9..578dc7ff 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="line-channel-access-token" class="form-label">{{ $t("Channel access token") }}</label>
+        <label for="line-channel-access-token" class="form-label">{{ $t("ChannelAccessTokenLongLived") }}</label>
         <HiddenInput id="line-channel-access-token" v-model="$parent.notification.lineChannelAccessToken" :required="true" autocomplete="new-password"></HiddenInput>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
diff --git a/src/lang/en.json b/src/lang/en.json
index 418ac58f..d9109a7a 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -532,6 +532,7 @@
     "Recipients": "Recipients",
     "Access Token": "Access Token",
     "Channel access token": "Channel access token",
+    "ChannelAccessTokenLongLived": "Channel access token (Long-lived)",
     "Line Developers Console": "Line Developers Console",
     "lineDevConsoleTo": "Line Developers Console - {0}",
     "Basic Settings": "Basic Settings",

From ee99ee94601a3352d95151c75afda1d6444a2abe Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Tue, 27 Feb 2024 00:09:56 +0100
Subject: [PATCH 27/45] changed which translation we are using

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

diff --git a/src/components/notifications/Line.vue b/src/components/notifications/Line.vue
index 578dc7ff..8ab6a048 100644
--- a/src/components/notifications/Line.vue
+++ b/src/components/notifications/Line.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mb-3">
-        <label for="line-channel-access-token" class="form-label">{{ $t("ChannelAccessTokenLongLived") }}</label>
+        <label for="line-channel-access-token" class="form-label">{{ $t("Channel access token (Long-lived)") }}</label>
         <HiddenInput id="line-channel-access-token" v-model="$parent.notification.lineChannelAccessToken" :required="true" autocomplete="new-password"></HiddenInput>
     </div>
     <i18n-t tag="div" keypath="lineDevConsoleTo" class="form-text">
diff --git a/src/lang/en.json b/src/lang/en.json
index d9109a7a..21828bdb 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -532,7 +532,7 @@
     "Recipients": "Recipients",
     "Access Token": "Access Token",
     "Channel access token": "Channel access token",
-    "ChannelAccessTokenLongLived": "Channel access token (Long-lived)",
+    "Channel access token (Long-lived)": "Channel access token (Long-lived)",
     "Line Developers Console": "Line Developers Console",
     "lineDevConsoleTo": "Line Developers Console - {0}",
     "Basic Settings": "Basic Settings",

From 7756070c57d081cadc1a17661d54f4c8bb45632f Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Wed, 28 Feb 2024 09:47:14 +0100
Subject: [PATCH 28/45] refactor MS-Teams notification to use adaptive cards

---
 server/notification-providers/teams.js | 119 +++++++++++++++++++------
 1 file changed, 92 insertions(+), 27 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 30976cf5..3568acad 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -21,18 +21,32 @@ class Teams extends NotificationProvider {
     };
 
     /**
-     * Select theme color to use based on status
+     * Select the style to use based on status
      * @param {const} status The status constant
-     * @returns {string} Selected color in hex RGB format
+     * @returns {string} Selected style for adaptive cards
      */
-    _getThemeColor = (status) => {
+    _getStyle = (status) => {
         if (status === DOWN) {
-            return "ff0000";
+            return "attention";
         }
         if (status === UP) {
-            return "00e804";
+            return "good";
+        }
+        return "emphasis";
+    };
+
+    /**
+     * Format an URL in the markdown format
+     * @param {string} url An absolute URL
+     * @param {string} linkName Optional name of the link
+     * @returns {string} The URL formatted as markdown link
+     */
+    _formatAsMarkdownLink = (url, linkName) => {
+        if (linkName) {
+            return `[${linkName}](${url})`;
+        } else {
+            return `[${url}](${url})`;
         }
-        return "008cff";
     };
 
     /**
@@ -57,40 +71,91 @@ class Teams extends NotificationProvider {
 
         const facts = [];
 
+        if (monitorMessage) {
+            facts.push({
+                title: "Description",
+                value: monitorMessage,
+            });
+        }
+
         if (monitorName) {
             facts.push({
-                name: "Monitor",
+                title: "Monitor",
                 value: monitorName,
             });
         }
 
         if (monitorUrl && monitorUrl !== "https://") {
             facts.push({
-                name: "URL",
-                value: monitorUrl,
+                title: "URL",
+                value: this._formatAsMarkdownLink(monitorUrl),
             });
         }
 
         return {
-            "@context": "https://schema.org/extensions",
-            "@type": "MessageCard",
-            themeColor: this._getThemeColor(status),
-            summary: notificationMessage,
-            sections: [
-                {
-                    activityImage:
-                        "https://raw.githubusercontent.com/louislam/uptime-kuma/master/public/icon.png",
-                    activityTitle: "**Uptime Kuma**",
-                },
-                {
-                    activityTitle: notificationMessage,
-                },
+            "type": "message",
+            "attachments": [
                 {
-                    activityTitle: "**Description**",
-                    text: monitorMessage,
-                    facts,
-                },
-            ],
+                    "contentType": "application/vnd.microsoft.card.adaptive",
+                    "contentUrl": "",
+                    "content": {
+                        "type": "AdaptiveCard",
+                        "body": [
+                            {
+                                "type": "Container",
+                                "verticalContentAlignment": "Center",
+                                "items": [
+                                    {
+                                        "type": "ColumnSet",
+                                        "style": this._getStyle(status),
+                                        "columns": [
+                                            {
+                                                "type": "Column",
+                                                "width": "auto",
+                                                "verticalContentAlignment": "Center",
+                                                "items": [
+                                                    {
+                                                        "type": "Image",
+                                                        "width": "32px",
+                                                        "style": "Person",
+                                                        "url": "https://raw.githubusercontent.com/louislam/uptime-kuma/master/public/icon.png",
+                                                        "altText": "Uptime Kuma Logo"
+                                                    }
+                                                ]
+                                            },
+                                            {
+                                                "type": "Column",
+                                                "width": "stretch",
+                                                "items": [
+                                                    {
+                                                        "type": "TextBlock",
+                                                        "size": "Large",
+                                                        "weight": "Bolder",
+                                                        "text": "**Uptime Kuma Alert**"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    }
+                                ]
+                            },
+                            {
+                                "type": "TextBlock",
+                                "weight": "Bolder",
+                                "text": notificationMessage,
+                                "separator": true,
+                                "wrap": true
+                            },
+                            {
+                                "type": "FactSet",
+                                "facts": facts
+                            }
+                        ],
+                        "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+                        "version": "1.5"
+                    }
+                }
+            ]
         };
     };
 

From c7b8bb9e4aef849cb3259b73f8c38148d72058ab Mon Sep 17 00:00:00 2001
From: Nelson Chan <3271800+chakflying@users.noreply.github.com>
Date: Wed, 28 Feb 2024 18:57:58 +0800
Subject: [PATCH 29/45] Fix: Incorrect handling of status page not found
 (#4537)

---
 server/routers/status-page-router.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/routers/status-page-router.js b/server/routers/status-page-router.js
index 29acaf8e..42cccc94 100644
--- a/server/routers/status-page-router.js
+++ b/server/routers/status-page-router.js
@@ -40,16 +40,12 @@ router.get("/api/status-page/:slug", cache("5 minutes"), async (request, respons
         ]);
 
         if (!statusPage) {
+            sendHttpError(response, "Status Page Not Found");
             return null;
         }
 
         let statusPageData = await StatusPage.getStatusPageData(statusPage);
 
-        if (!statusPageData) {
-            sendHttpError(response, "Not Found");
-            return;
-        }
-
         // Response
         response.json(statusPageData);
 

From 5b87da94b3834383d4c83c04cc0c20b4e8f77e7e Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Wed, 28 Feb 2024 14:19:32 +0100
Subject: [PATCH 30/45] push notificationMessage to card header and add action
 button to dashboard

---
 server/notification-providers/teams.js | 88 ++++++++++++++++----------
 1 file changed, 53 insertions(+), 35 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 3568acad..16ce6435 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -1,6 +1,7 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
+const { setting } = require("../util-server");
+const { DOWN, UP, getMonitorRelativeURL } = require("../../src/util");
 
 class Teams extends NotificationProvider {
     name = "teams";
@@ -13,9 +14,9 @@ class Teams extends NotificationProvider {
      */
     _statusMessageFactory = (status, monitorName) => {
         if (status === DOWN) {
-            return `🔴 Application [${monitorName}] went down`;
+            return `🔴 [${monitorName}] went down`;
         } else if (status === UP) {
-            return `✅ Application [${monitorName}] is back online`;
+            return `✅ [${monitorName}] is back online`;
         }
         return "Notification";
     };
@@ -35,27 +36,14 @@ class Teams extends NotificationProvider {
         return "emphasis";
     };
 
-    /**
-     * Format an URL in the markdown format
-     * @param {string} url An absolute URL
-     * @param {string} linkName Optional name of the link
-     * @returns {string} The URL formatted as markdown link
-     */
-    _formatAsMarkdownLink = (url, linkName) => {
-        if (linkName) {
-            return `[${linkName}](${url})`;
-        } else {
-            return `[${url}](${url})`;
-        }
-    };
-
     /**
      * Generate payload for notification
      * @param {object} args Method arguments
      * @param {const} args.status The status of the monitor
      * @param {string} args.monitorMessage Message to send
-     * @param {string} args.monitorName Name of monitor affected
-     * @param {string} args.monitorUrl URL of monitor affected
+     * @param {string} args.monitorName Name of the monitor affected
+     * @param {string} args.monitorUrl URL of the monitor affected
+     * @param {string} args.dashboardUrl URL of the dashboard affected
      * @returns {object} Notification payload
      */
     _notificationPayloadFactory = ({
@@ -63,6 +51,7 @@ class Teams extends NotificationProvider {
         monitorMessage,
         monitorName,
         monitorUrl,
+        dashboardUrl,
     }) => {
         const notificationMessage = this._statusMessageFactory(
             status,
@@ -88,11 +77,14 @@ class Teams extends NotificationProvider {
         if (monitorUrl && monitorUrl !== "https://") {
             facts.push({
                 title: "URL",
-                value: this._formatAsMarkdownLink(monitorUrl),
+                // format URL as markdown syntax, to be clickable
+                value: `[${monitorUrl}](${monitorUrl})`,
             });
         }
 
-        return {
+        const headerMessage = `**${notificationMessage}**`;
+
+        const payload = {
             "type": "message",
             "attachments": [
                 {
@@ -129,9 +121,17 @@ class Teams extends NotificationProvider {
                                                 "items": [
                                                     {
                                                         "type": "TextBlock",
-                                                        "size": "Large",
+                                                        "size": "Medium",
                                                         "weight": "Bolder",
-                                                        "text": "**Uptime Kuma Alert**"
+                                                        "text": headerMessage,
+                                                    },
+                                                    {
+                                                        "type": "TextBlock",
+                                                        "size": "Small",
+                                                        "weight": "Default",
+                                                        "text": "Uptime Kuma Alert",
+                                                        "isSubtle": true,
+                                                        "spacing": "None"
                                                     }
                                                 ]
                                             }
@@ -139,15 +139,9 @@ class Teams extends NotificationProvider {
                                     }
                                 ]
                             },
-                            {
-                                "type": "TextBlock",
-                                "weight": "Bolder",
-                                "text": notificationMessage,
-                                "separator": true,
-                                "wrap": true
-                            },
                             {
                                 "type": "FactSet",
+                                "separator": true,
                                 "facts": facts
                             }
                         ],
@@ -157,6 +151,23 @@ class Teams extends NotificationProvider {
                 }
             ]
         };
+
+        if (dashboardUrl) {
+            payload.attachments.forEach(element => {
+                element.content.push({
+                    "type": "ActionSet",
+                    "actions": [
+                        {
+                            "type": "Action.OpenUrl",
+                            "title": "Visit Uptime Kuma",
+                            "url": dashboardUrl
+                        }
+                    ]
+                });
+            });
+        }
+
+        return payload;
     };
 
     /**
@@ -195,26 +206,33 @@ class Teams extends NotificationProvider {
                 return okMsg;
             }
 
-            let url;
+            let monitorUrl;
 
             switch (monitorJSON["type"]) {
                 case "http":
                 case "keywork":
-                    url = monitorJSON["url"];
+                    monitorUrl = monitorJSON["url"];
                     break;
                 case "docker":
-                    url = monitorJSON["docker_host"];
+                    monitorUrl = monitorJSON["docker_host"];
                     break;
                 default:
-                    url = monitorJSON["hostname"];
+                    monitorUrl = monitorJSON["hostname"];
                     break;
             }
 
+            const baseURL = await setting("primaryBaseURL");
+            let dashboardUrl;
+            if (baseURL) {
+                dashboardUrl = baseURL + getMonitorRelativeURL(monitorJSON.id);
+            }
+
             const payload = this._notificationPayloadFactory({
                 monitorMessage: heartbeatJSON.msg,
                 monitorName: monitorJSON.name,
-                monitorUrl: url,
+                monitorUrl: monitorUrl,
                 status: heartbeatJSON.status,
+                dashboardUrl: dashboardUrl,
             });
 
             await this._sendNotification(notification.webhookUrl, payload);

From b8941403d16cbadadcef0f3f21e7a0af1600089e Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Wed, 28 Feb 2024 16:30:48 +0100
Subject: [PATCH 31/45] code cleanup

---
 server/notification-providers/teams.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 16ce6435..4435d2dd 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -14,9 +14,9 @@ class Teams extends NotificationProvider {
      */
     _statusMessageFactory = (status, monitorName) => {
         if (status === DOWN) {
-            return `🔴 [${monitorName}] went down`;
+            return `[${monitorName}] went down`;
         } else if (status === UP) {
-            return `✅ [${monitorName}] is back online`;
+            return `[${monitorName}] is back online`;
         }
         return "Notification";
     };
@@ -82,8 +82,6 @@ class Teams extends NotificationProvider {
             });
         }
 
-        const headerMessage = `**${notificationMessage}**`;
-
         const payload = {
             "type": "message",
             "attachments": [
@@ -123,7 +121,7 @@ class Teams extends NotificationProvider {
                                                         "type": "TextBlock",
                                                         "size": "Medium",
                                                         "weight": "Bolder",
-                                                        "text": headerMessage,
+                                                        "text": `**${notificationMessage}**`,
                                                     },
                                                     {
                                                         "type": "TextBlock",
@@ -141,7 +139,7 @@ class Teams extends NotificationProvider {
                             },
                             {
                                 "type": "FactSet",
-                                "separator": true,
+                                "separator": false,
                                 "facts": facts
                             }
                         ],

From cc09147b4bbd831fd614ed5c770dc7496d7638f3 Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Wed, 28 Feb 2024 16:31:47 +0100
Subject: [PATCH 32/45] fix adding optional ActionSet

---
 server/notification-providers/teams.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index 4435d2dd..e46bc9e3 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -151,17 +151,15 @@ class Teams extends NotificationProvider {
         };
 
         if (dashboardUrl) {
-            payload.attachments.forEach(element => {
-                element.content.push({
-                    "type": "ActionSet",
-                    "actions": [
-                        {
-                            "type": "Action.OpenUrl",
-                            "title": "Visit Uptime Kuma",
-                            "url": dashboardUrl
-                        }
-                    ]
-                });
+            payload.attachments[0].content.body.push({
+                "type": "ActionSet",
+                "actions": [
+                    {
+                        "type": "Action.OpenUrl",
+                        "title": "Visit Uptime Kuma",
+                        "url": dashboardUrl
+                    }
+                ]
             });
         }
 

From 8bd69d78a84937849748371053b3676513b6ff8b Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Wed, 28 Feb 2024 17:41:00 +0100
Subject: [PATCH 33/45] some more tweaking of the card content and notification
 summary

---
 server/notification-providers/teams.js | 61 +++++++++++++++-----------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index e46bc9e3..e8aab1a4 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -10,13 +10,14 @@ class Teams extends NotificationProvider {
      * Generate the message to send
      * @param {const} status The status constant
      * @param {string} monitorName Name of monitor
+     * @param {boolean} withStatusSymbol If the status should be prepended as symbol
      * @returns {string} Status message
      */
-    _statusMessageFactory = (status, monitorName) => {
+    _statusMessageFactory = (status, monitorName, withStatusSymbol) => {
         if (status === DOWN) {
-            return `[${monitorName}] went down`;
+            return (withStatusSymbol ? "🔴 " : "") + `[${monitorName}] went down`;
         } else if (status === UP) {
-            return `[${monitorName}] is back online`;
+            return (withStatusSymbol ? "✅ " : "") + `[${monitorName}] is back online`;
         }
         return "Notification";
     };
@@ -39,31 +40,34 @@ class Teams extends NotificationProvider {
     /**
      * Generate payload for notification
      * @param {object} args Method arguments
-     * @param {const} args.status The status of the monitor
-     * @param {string} args.monitorMessage Message to send
+     * @param {object} args.heartbeatJSON Heartbeat details
      * @param {string} args.monitorName Name of the monitor affected
      * @param {string} args.monitorUrl URL of the monitor affected
      * @param {string} args.dashboardUrl URL of the dashboard affected
      * @returns {object} Notification payload
      */
     _notificationPayloadFactory = ({
-        status,
-        monitorMessage,
+        heartbeatJSON,
         monitorName,
         monitorUrl,
         dashboardUrl,
     }) => {
-        const notificationMessage = this._statusMessageFactory(
-            status,
-            monitorName
-        );
-
+        const status = heartbeatJSON.status;
         const facts = [];
+        const actions = [];
+
+        if (dashboardUrl) {
+            actions.push({
+                "type": "Action.OpenUrl",
+                "title": "Visit Uptime Kuma",
+                "url": dashboardUrl
+            });
+        }
 
-        if (monitorMessage) {
+        if (heartbeatJSON?.msg) {
             facts.push({
                 title: "Description",
-                value: monitorMessage,
+                value: heartbeatJSON.msg,
             });
         }
 
@@ -80,10 +84,24 @@ class Teams extends NotificationProvider {
                 // format URL as markdown syntax, to be clickable
                 value: `[${monitorUrl}](${monitorUrl})`,
             });
+            actions.push({
+                "type": "Action.OpenUrl",
+                "title": "Visit Monitor URL",
+                "url": monitorUrl
+            });
+        }
+
+        if (heartbeatJSON?.localDateTime) {
+            facts.push({
+                title: "Time",
+                value: heartbeatJSON.localDateTime + (heartbeatJSON.timezone ? ` (${heartbeatJSON.timezone})` : ""),
+            });
         }
 
         const payload = {
             "type": "message",
+            // message with status prefix as notification text
+            "summary": this._statusMessageFactory(status, monitorName, true),
             "attachments": [
                 {
                     "contentType": "application/vnd.microsoft.card.adaptive",
@@ -121,7 +139,7 @@ class Teams extends NotificationProvider {
                                                         "type": "TextBlock",
                                                         "size": "Medium",
                                                         "weight": "Bolder",
-                                                        "text": `**${notificationMessage}**`,
+                                                        "text": `**${this._statusMessageFactory(status, monitorName, false)}**`,
                                                     },
                                                     {
                                                         "type": "TextBlock",
@@ -150,16 +168,10 @@ class Teams extends NotificationProvider {
             ]
         };
 
-        if (dashboardUrl) {
+        if (actions) {
             payload.attachments[0].content.body.push({
                 "type": "ActionSet",
-                "actions": [
-                    {
-                        "type": "Action.OpenUrl",
-                        "title": "Visit Uptime Kuma",
-                        "url": dashboardUrl
-                    }
-                ]
+                "actions": actions,
             });
         }
 
@@ -224,10 +236,9 @@ class Teams extends NotificationProvider {
             }
 
             const payload = this._notificationPayloadFactory({
-                monitorMessage: heartbeatJSON.msg,
+                heartbeatJSON: heartbeatJSON,
                 monitorName: monitorJSON.name,
                 monitorUrl: monitorUrl,
-                status: heartbeatJSON.status,
                 dashboardUrl: dashboardUrl,
             });
 

From 507ff76728d78cbbc76228af77d4ee02c80c8458 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Sun, 3 Mar 2024 10:44:53 +0100
Subject: [PATCH 34/45] More readable Contribution guide (#4525)

Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
---
 CONTRIBUTING.md | 235 ++++++++++++++++++++++++++++--------------------
 1 file changed, 137 insertions(+), 98 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1712b66c..f8bd8d9b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,32 +1,29 @@
 # Project Info
 
-First of all, I want to thank everyone who have made pull requests for Uptime Kuma. I never thought the GitHub community would be so nice! Because of this, I also never thought that other people would actually read and edit my code. It is not very well structured or commented, sorry about that.
+First of all, I want to thank everyone who have wrote issues or shared pull requests for Uptime Kuma.
+I never thought the GitHub community would be so nice!
+Because of this, I also never thought that other people would actually read and edit my code.
+Parts of the code are not very well-structured or commented, sorry about that.
 
-The project was created with vite.js (vue3). Then I created a subdirectory called "server" for the server part. Both frontend and backend share the same `package.json`.
+The project was created with `vite.js` and is written in `vue3`.
+Our backend lives in the `server`-directory and mostly communicates via websockets.
+Both frontend and backend share the same `package.json`.
 
-The frontend code builds into "dist" directory. The server (express.js) exposes the "dist" directory as the root of the endpoint. This is how production is working.
-
-## Key Technical Skills
-
-- Node.js (You should know about promises, async/await, arrow functions, etc.)
-- Socket.io
-- SCSS
-- Vue.js
-- Bootstrap
-- SQLite
+For production, the frontend is build into `dist`-directory and the server (`express.js`) exposes the `dist` directory as the root of the endpoint.
+For development, we run vite in development mode on another port. 
 
 ## Directories
 
-- config (dev config files)
-- data (App data)
-- db (Base database and migration scripts)
-- dist (Frontend build)
-- docker (Dockerfiles)
-- extra (Extra useful scripts)
-- public (Frontend resources for dev only)
-- server (Server source code)
-- src (Frontend source code)
-- test (unit test)
+- `config` (dev config files)
+- `data` (App data)
+- `db` (Base database and migration scripts)
+- `dist` (Frontend build)
+- `docker` (Dockerfiles)
+- `extra` (Extra useful scripts)
+- `public` (Frontend resources for dev only)
+- `server` (Server source code)
+- `src` (Frontend source code)
+- `test` (unit test)
 
 ## Can I create a pull request for Uptime Kuma?
 
@@ -66,11 +63,20 @@ I ([@louislam](https://github.com/louislam)) have the final say. If your pull re
 
 I will assign your pull request to a [milestone](https://github.com/louislam/uptime-kuma/milestones), if I plan to review and merge it.
 
-Also, please don't rush or ask for an ETA, because I have to understand the pull request, make sure it is no breaking changes and stick to my vision of this project, especially for large pull requests.
+Please don't rush or ask for an ETA.
+We have to understand the pull request, make sure it has no breaking changes and stick to the vision of this project, especially for large pull requests.
+
+
+## I'd like to work on an issue. How do I do that?
+
+We have found that assigning people to issues is management-overhead that we don't need.
+A short comment that you want to try your hand at this issue is appreciated to save other devs time.
+If you come across any problem during development, feel free to leave a comment with what you are stuck on.
 
 ### Recommended Pull Request Guideline
 
-Before deep into coding, discussion first is preferred. Creating an empty pull request for discussion would be recommended.
+Before diving deep into coding, having a discussion first by creating an empty pull request for discussion is preferred.
+The rationale behind this is that we can align the direction and scope of the feature to eliminate any conflicts with existing and planned work, and can help by pointing out any potential pitfalls.
 
 1. Fork the project
 2. Clone your fork repo to local
@@ -84,10 +90,16 @@ Before deep into coding, discussion first is preferred. Creating an empty pull r
 
 ## Project Styles
 
-I personally do not like something that requires so many configurations before you can finally start the app. I hope Uptime Kuma installation will be as easy as like installing a mobile app.
+I personally do not like something that requires so many configurations before you can finally start the app.
+The goal is to make the Uptime Kuma installation as easy as installing a mobile app.
 
-- Easy to install for non-Docker users, no native build dependency is needed (for x86_64/armv7/arm64), no extra config, and no extra effort required to get it running
-- Single container for Docker users, no very complex docker-compose file. Just map the volume and expose the port, then good to go
+- Easy to install for non-Docker users
+  - no native build dependency is needed (for `x86_64`/`armv7`/`arm64`)
+  - no extra configuration and
+  - no extra effort required to get it running
+- Single container for Docker users
+  - no complex docker-compose file
+  - mapping the volume and exposing the port should be the only requirements
 - Settings should be configurable in the frontend. Environment variables are discouraged, unless it is related to startup such as `DATA_DIR`
 - Easy to use
 - The web UI styling should be consistent and nice
@@ -154,25 +166,25 @@ npm run start-server-dev
 
 It binds to `0.0.0.0:3001` by default.
 
-It is mainly a socket.io app + express.js.
-
-express.js is used for:
+The backend is an `express.js` server with `socket.io` integrated.
+It uses `socket.io` to communicate with clients, and most server logic is encapsulated in the `socket.io` handlers.
+`express.js` is also used to serve:
 
-- entry point such as redirecting to a status page or the dashboard
-- serving the frontend built files (index.html, .js and .css etc.)
-- serving internal APIs of the status page
+- as an entry point for redirecting to a status page or the dashboard
+- the frontend built files (`index.html`, `*.js`, `*.css`, etc.)
+- internal APIs of the status page
 
-### Structure in /server/
+### Structure in `/server/`
 
-- jobs/ (Jobs that are running in another process)
-- model/ (Object model, auto-mapping to the database table name)
-- modules/ (Modified 3rd-party modules)
-- monitor_types (Monitor Types)
-- notification-providers/ (individual notification logic)
-- routers/ (Express Routers)
-- socket-handler (Socket.io Handlers)
-- server.js (Server entry point)
-- uptime-kuma-server.js (UptimeKumaServer class, main logic should be here, but some still in `server.js`)
+- `jobs/` (Jobs that are running in another process)
+- `model/` (Object model, auto-mapping to the database table name)
+- `modules/` (Modified 3rd-party modules)
+- `monitor_types/` (Monitor Types)
+- `notification-providers/` (individual notification logic)
+- `routers/` (Express Routers)
+- `socket-handler/` (Socket.io Handlers)
+- `server.js` (Server entry point)
+- `uptime-kuma-server.js` (UptimeKumaServer class, main logic should be here, but some still in `server.js`)
 
 ## Frontend Dev Server
 
@@ -211,14 +223,15 @@ npm test
 
 ## Dependencies
 
-Both frontend and backend share the same package.json. However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into dist files. So:
+Both frontend and backend share the same `package.json`.
+However, the frontend dependencies are eventually not used in the production environment, because it is usually also baked into `dist` files. So:
 
 - Frontend dependencies = "devDependencies"
-  - Examples: vue, chart.js
+  - Examples: `vue`, `chart.js`
 - Backend dependencies = "dependencies"
-  - Examples: socket.io, sqlite3
+  - Examples: `socket.io`, `sqlite3`
 - Development dependencies = "devDependencies"
-  - Examples: eslint, sass
+  - Examples: `eslint`, `sass`
 
 ### Update Dependencies
 
@@ -289,54 +302,80 @@ https://github.com/louislam/uptime-kuma-wiki
 Check the latest issues and pull requests:
 https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 
-### Release Procedures
-
-1. Draft a release note
-2. Make sure the repo is cleared
-3. If the healthcheck is updated, remember to re-compile it: `npm run build-docker-builder-go`
-4. `npm run release-final` with env vars: `VERSION` and `GITHUB_TOKEN`
-5. Wait until the `Press any key to continue`
-6. `git push`
-7. Publish the release note as 1.X.X
-8. Press any key to continue
-9. Deploy to the demo server: `npm run deploy-demo-server`
-
-Checking:
-
-- Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
-- Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
-- Try clean installation with Node.js
-
-### Release Beta Procedures
-
-1. Draft a release note, check "This is a pre-release"
-2. Make sure the repo is cleared
-3. `npm run release-beta` with env vars: `VERSION` and `GITHUB_TOKEN`
-4. Wait until the `Press any key to continue`
-5. Publish the release note as 1.X.X-beta.X
-6. Press any key to continue
-
-### Release Wiki
-
-#### Setup Repo
-
-```bash
-git clone https://github.com/louislam/uptime-kuma-wiki.git
-cd uptime-kuma-wiki
-git remote add production https://github.com/louislam/uptime-kuma.wiki.git
-```
-
-#### Push to Production Wiki
-
-```bash
-git pull
-git push production master
-```
-
-## Useful Commands
-
-Change the base of a pull request such as `master` to `1.23.X`
-
-```bash
-git rebase --onto <new parent> <old parent>
-```
+### What is a maintainer and what are their roles?
+
+This project has multiple maintainers which specialise in different areas.
+Currently, there are 3 maintainers:
+
+| Person            | Role              | Main Area        |
+|-------------------|-------------------|------------------|
+| `@louislam`       | senior maintainer | major features   |
+| `@chakflying`     | junior maintainer | fixing bugs      |
+| `@commanderstorm` | junior maintainer | issue-management |
+
+### Procedures
+
+We have a few procedures we follow. These are documented here:
+
+- <details><summary>Release</summary>
+  <p>
+
+  1. Draft a release note
+  2. Make sure the repo is cleared
+  3. If the healthcheck is updated, remember to re-compile it: `npm run build-docker-builder-go`
+  4. `npm run release-final` with env vars: `VERSION` and `GITHUB_TOKEN`
+  5. Wait until the `Press any key to continue`
+  6. `git push`
+  7. Publish the release note as `1.X.X`
+  8. Press any key to continue
+  9. Deploy to the demo server: `npm run deploy-demo-server`
+
+  These Items need to be checked:
+
+  - [ ] Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
+  - [ ] Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
+  - [ ] Try clean installation with Node.js
+  
+  </p>
+  </details>
+- <details><summary>Release Beta</summary>
+  <p>
+
+  1. Draft a release note, check `This is a pre-release`
+  2. Make sure the repo is cleared
+  3. `npm run release-beta` with env vars: `VERSION` and `GITHUB_TOKEN`
+  4. Wait until the `Press any key to continue`
+  5. Publish the release note as `1.X.X-beta.X`
+  6. Press any key to continue
+  
+  </p>
+  </details>
+- <details><summary>Release Wiki</summary>
+  <p>
+
+  **Setup Repo**
+  
+  ```bash
+  git clone https://github.com/louislam/uptime-kuma-wiki.git
+  cd uptime-kuma-wiki
+  git remote add production https://github.com/louislam/uptime-kuma.wiki.git
+  ```
+  
+  **Push to Production Wiki**
+  
+  ```bash
+  git pull
+  git push production master
+  ```
+  
+  </p>
+  </details>
+- <details><summary>Change the base of a pull request such as <code>master</code> to <code>1.23.X</code></summary>
+  <p>
+  
+  ```bash
+  git rebase --onto <new parent> <old parent>
+  ```
+  
+  </p>
+  </details>

From 4c683da0ddb5a221e085766c8c028f4b06ee2878 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Sun, 3 Mar 2024 10:45:35 +0100
Subject: [PATCH 35/45] Refactored the `Can I create a pull request for Uptime
 Kuma` section (#4545)

---
 CONTRIBUTING.md | 167 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 139 insertions(+), 28 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f8bd8d9b..2eedd548 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,39 +27,150 @@ For development, we run vite in development mode on another port.
 
 ## Can I create a pull request for Uptime Kuma?
 
-Yes or no, it depends on what you will try to do. Since I don't want to waste your time, be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**. Especially for a large pull request or you don't know if it will be merged or not.
+Yes or no, it depends on what you will try to do.
+Both your and our maintainers time is precious, and we don't want to waste both time.
 
-Here are some references:
+If you have any questions about any process/.. is not clear, you are likely not alone => please ask them ^^
 
-### ✅ Usually accepted
-
-- Bug fix
-- Security fix
-- Adding notification providers
-- Adding new language files (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
-- Adding new language keys: `$t("...")`
-
-### ⚠️ Discussion required
-
-- Large pull requests
-- New features
-
-### ❌ Won't be merged
+Different guidelines exist for different types of pull requests (PRs):
+- <details><summary><b>security fixes</b></summary>
+  <p>
+  
+  Submitting security fixes is something that may put the community at risk.
+  Please read through our [security policy](SECURITY.md) and submit vulnerabilities via an [advisory](https://github.com/louislam/uptime-kuma/security/advisories/new) + [issue](https://github.com/louislam/uptime-kuma/issues/new?assignees=&labels=help&template=security.md) instead.
+  We encourage you to submit how to fix a vulnerability if you know how to, this is not required.
+  Following the security policy allows us to properly test, fix bugs.
+  This review allows us to notice, if there are any changes necessary to unrelated parts like the documentation.  
+  [**PLEASE SEE OUR SECURITY POLICY.**](SECURITY.md)
+  
+  </p>
+  </details>
+- <details><summary><b>small, non-breaking bug fixes</b></summary>
+  <p>
+  
+  If you come across a bug and think you can solve, we appreciate your work.
+  Please make sure that you follow by these rules:
+  - keep the PR as small as possible, fix only one thing at a time => keeping it reviewable
+  - test that your code does what you came it does.
+  
+  <sub>Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.</sub>
+  </p>
+  </details> 
+- <details><summary><b>translations / internationalisation (i18n)</b></summary>
+  <p>
+  
+  We use weblate to localise this project into many languages.
+  If you are unhappy with a translation this is the best start.
+  On how to translate using weblate, please see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md).
+  
+  There are two cases in which a change cannot be done in weblate and requires a PR:
+  - A text may not be currently localisable. In this case, **adding a new language key** via `$t("languageKey")` might be nessesary
+  - language keys need to be **added to `en.json`** to be visible in weblate. If this has not happened, a PR is appreciated.
+  - **Adding a new language** requires a new file see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md)
+  
+  <sub>Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.</sub>
+  </p>
+  </details> 
+- <details><summary><b>new notification providers</b></summary>
+  <p>
+  
+  To set up a new notification provider these files need to be modified/created:
+  - `server/notification-providers/PROVIDER_NAME.js` is where the heart of the notification provider lives.
+    - Both `monitorJSON` and `heartbeatJSON` can be `null` for some events.
+      If both are `null`, this is a general testing message, but if just `heartbeatJSON` is `null` this is a certificate expiry.
+    - Please wrap the axios call into a 
+      ```js
+      try {
+        let result = await axios.post(...);
+        if (result.status === ...) ...
+      } catch (error) {
+        this.throwGeneralAxiosError(error);
+      }
+      ```
+  - `server/notification.js` is where the backend of the notification provider needs to be registered.
+    *If you have an idea how we can skip this step, we would love to hear about it ^^*
+  - `src/components/NotificationDialog.vue` you need to decide if the provider is a regional or a global one and add it with a name to the respective list
+  - `src/components/notifications/PROVIDER_NAME.vue` is where the frontend of each provider lives.
+    Please make sure that you have:
+    - used `HiddenInput` for secret credentials
+    - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users. 
+    - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
+  - `src/components/notifications/index.js` is where the frontend of the provider needs to be registered.
+    *If you have an idea how we can skip this step, we would love to hear about it ^^*
+
+  Offering notifications is close to the core of what we are as an uptime monitor.
+  Therefore, making sure that they work is also really important.
+  Because testing notification providers is quite time intensive, we mostly offload this onto the person contributing a notification provider.
+  
+  To make shure you have tested the notification provider, please include screenshots of the following events in the pull-request description:
+    - `UP`/`DOWN`
+    - Certificate Expiry via https://expired.badssl.com/
+    - Testing (the test button on the notification provider setup page)
+  
+  Using the following way to format this is encouraged:
+  ```md
+  | Event | Before | After |
+  ------------------
+  | `UP` | paste-image-here | paste-image-here |
+  | `DOWN` | paste-image-here | paste-image-here |
+  | Certificate-expiry | paste-image-here | paste-image-here |
+  | Testing | paste-image-here | paste-image-here |
+  ```
 
-- A dedicated PR for translating existing languages (see [these instructions](https://github.com/louislam/uptime-kuma/blob/master/src/lang/README.md))
-- Do not pass the auto-test
-- Any breaking changes
-- Duplicated pull requests
-- Buggy
-- UI/UX is not close to Uptime Kuma
-- Modifications or deletions of existing logic without a valid reason.
-- Adding functions that is completely out of scope
-- Converting existing code into other programming languages
-- Unnecessarily large code changes that are hard to review and cause conflicts with other PRs.
+  <sub>Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.</sub>
+  </p>
+  </details>
+- <details><summary><b>new monitoring types</b></summary>
+  <p>
 
-The above cases may not cover all possible situations.
+  To set up a new notification provider these files need to be modified/created:
+  - `server/monitor-types/MONITORING_TYPE.js` is the core of each monitor.
+    the `async check(...)`-function should:
+    - throw an error for each fault that is detected with an actionable error message
+    - in the happy-path, you should set `heartbeat.msg` to a successfull message and set `heartbeat.status = UP`
+  - `server/uptime-kuma-server.js` is where the monitoring backend needs to be registered.
+    *If you have an idea how we can skip this step, we would love to hear about it ^^*
+  - `src/pages/EditMonitor.vue` is the shared frontend users interact with.
+    Please make sure that you have:
+    - used `HiddenInput` for secret credentials
+    - included all the necessary helptexts/placeholder/.. to make sure the notification provider is simple to setup for new users.
+    - include all translations (`{{ $t("Translation key") }}`, [`i18n-t keypath="Translation key">`](https://vue-i18n.intlify.dev/guide/advanced/component.html)) in `src/lang/en.json` to enable our translators to translate this
+  - 
+
+
+  <sub>Because maintainer time is precious junior maintainers may merge uncontroversial PRs in this area.</sub>
+  </p>
+  </details> 
+- <details><summary><b>new features/ major changes / breaking bugfixes</b></summary>
+  <p>
+  
+  be sure to **create an empty draft pull request or open an issue, so we can have a discussion first**.
+  This is especially important for a large pull request or you don't know if it will be merged or not.
+  
+  <sub>Because of the large impact of this work, only senior maintainers may merge PRs in this area.</sub>
+  </p>
+  </details>
 
-I ([@louislam](https://github.com/louislam)) have the final say. If your pull request does not meet my expectations, I will reject it, no matter how much time you spent on it. Therefore, it is essential to have a discussion beforehand.
+The following rules are essential for making your PR mergable:
+- Merging multiple issues by a huge PR is more difficult to review and causes conflicts with other PRs. Please
+  - (if possible) **create one PR for one issue** or
+  - (if not possible) **explain which issues a PR addresses and why this PR should not be broken apart**
+- Make sure your **PR passes our continuous integration**.
+  PRs will not be merged unless all CI-Checks are green.
+- **Breaking changes** (unless for a good reason and discussed beforehand) will not get merged / not get merged quickly.
+  Such changes require a major version release.
+- **Test your code** before submitting a PR.
+  Buggy PRs will not be merged.
+- Make sure the **UI/UX is close to Uptime Kuma**.
+- **Think about the maintainability**:
+  Don't add functionality that is completely **out of scope**.
+  Keep in mind that we need to be able to maintain the functionality.
+- Don't modify or delete existing logic without a valid reason.
+- Don't convert existing code into other programming languages for no reason.
+
+I ([@louislam](https://github.com/louislam)) have the final say.
+If your pull request does not meet my expectations, I will reject it, no matter how much time you spent on it.
+Therefore, it is essential to have a discussion beforehand.
 
 I will assign your pull request to a [milestone](https://github.com/louislam/uptime-kuma/milestones), if I plan to review and merge it.
 

From 8fd713d642e71d3dda57a813f700cd445e47fabd Mon Sep 17 00:00:00 2001
From: Huzaifa Azim <74013767+huzaifaazim0@users.noreply.github.com>
Date: Sun, 3 Mar 2024 14:54:14 +0500
Subject: [PATCH 36/45] migrate timezones-list lib to @vvo/tzdb issue #4479
 (#4521)

---
 package-lock.json    | 13 ++++++-------
 package.json         |  2 +-
 src/util-frontend.js | 15 ++++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f2bce05..7578c191 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
                 "@grpc/grpc-js": "~1.7.3",
                 "@louislam/ping": "~0.4.4-mod.1",
                 "@louislam/sqlite3": "15.1.6",
+                "@vvo/tzdb": "^6.125.0",
                 "args-parser": "~1.3.0",
                 "axios": "~0.28.0",
                 "axios-ntlm": "1.3.0",
@@ -124,7 +125,6 @@
                 "stylelint-config-standard": "~25.0.0",
                 "terser": "~5.15.0",
                 "test": "~3.3.0",
-                "timezones-list": "~3.0.1",
                 "typescript": "~4.4.4",
                 "v-pagination-3": "~0.1.7",
                 "vite": "~5.0.10",
@@ -4672,6 +4672,11 @@
                 "vue": ">=3.2.0"
             }
         },
+        "node_modules/@vvo/tzdb": {
+            "version": "6.125.0",
+            "resolved": "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.125.0.tgz",
+            "integrity": "sha512-zxOP62q3CUYIIe6sL/IK6AhmhnPUuHPNx86qZTXuzQHo/QhQRTfXb331poUStTDdZgBoLc6BADUATbGGN/1d4A=="
+        },
         "node_modules/abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -13303,12 +13308,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/timezones-list": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/timezones-list/-/timezones-list-3.0.3.tgz",
-            "integrity": "sha512-C+Vdvvj2c1xB6pu81pOX8geo6mrk/QsudFVlTVQET7QQwu8WAIyhDNeCrK5grU7EMzmbKLWqz7uU6dN8fvQvPQ==",
-            "dev": true
-        },
         "node_modules/to-fast-properties": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
diff --git a/package.json b/package.json
index 0d2b1969..894079cf 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
         "@grpc/grpc-js": "~1.7.3",
         "@louislam/ping": "~0.4.4-mod.1",
         "@louislam/sqlite3": "15.1.6",
+        "@vvo/tzdb": "^6.125.0",
         "args-parser": "~1.3.0",
         "axios": "~0.28.0",
         "axios-ntlm": "1.3.0",
@@ -189,7 +190,6 @@
         "stylelint-config-standard": "~25.0.0",
         "terser": "~5.15.0",
         "test": "~3.3.0",
-        "timezones-list": "~3.0.1",
         "typescript": "~4.4.4",
         "v-pagination-3": "~0.1.7",
         "vite": "~5.0.10",
diff --git a/src/util-frontend.js b/src/util-frontend.js
index 1e30160e..d9bf378e 100644
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-import timezones from "timezones-list";
+import { getTimeZones } from "@vvo/tzdb";
 import { localeDirection, currentLocale } from "./i18n";
 import { POSITION } from "vue-toastification";
 
@@ -29,18 +29,19 @@ function getTimezoneOffset(timeZone) {
  */
 export function timezoneList() {
     let result = [];
+    const timeZones = getTimeZones();
 
-    for (let timezone of timezones) {
+    for (let timezone of timeZones) {
         try {
-            let display = dayjs().tz(timezone.tzCode).format("Z");
+            let display = dayjs().tz(timezone.name).format("Z");
 
             result.push({
-                name: `(UTC${display}) ${timezone.tzCode}`,
-                value: timezone.tzCode,
-                time: getTimezoneOffset(timezone.tzCode),
+                name: `(UTC${display}) ${timezone.name}`,
+                value: timezone.name,
+                time: getTimezoneOffset(timezone.name),
             });
         } catch (e) {
-            // Skipping not supported timezone.tzCode by dayjs
+            // Skipping not supported timezone.name by dayjs
         }
     }
 

From a0c62d8ab09a4e426d9db4a0bbe5356ce8cfa0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andi=20P=C3=A4tzold?= <github@andipaetzold.com>
Date: Sun, 3 Mar 2024 10:59:38 +0100
Subject: [PATCH 37/45] Fix: handle monitor names with slashes (#4472)

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 server/model/monitor.js   | 16 ++++++++++------
 src/pages/Details.vue     |  5 +----
 src/pages/EditMonitor.vue |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/model/monitor.js b/server/model/monitor.js
index b2fed86f..fbed48f9 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -96,11 +96,15 @@ class Monitor extends BeanModel {
             screenshot = "/screenshots/" + jwt.sign(this.id, UptimeKumaServer.getInstance().jwtSecret) + ".png";
         }
 
+        const path = await this.getPath();
+        const pathName = path.join(" / ");
+
         let data = {
             id: this.id,
             name: this.name,
             description: this.description,
-            pathName: await this.getPathName(),
+            path,
+            pathName,
             parent: this.parent,
             childrenIDs: await Monitor.getAllChildrenIDs(this.id),
             url: this.url,
@@ -1527,11 +1531,11 @@ class Monitor extends BeanModel {
     }
 
     /**
-     * Gets Full Path-Name (Groups and Name)
-     * @returns {Promise<string>} Full path name of this monitor
+     * Gets the full path
+     * @returns {Promise<string[]>} Full path (includes groups and the name) of the monitor
      */
-    async getPathName() {
-        let path = this.name;
+    async getPath() {
+        const path = [ this.name ];
 
         if (this.parent === null) {
             return path;
@@ -1539,7 +1543,7 @@ class Monitor extends BeanModel {
 
         let parent = await Monitor.getParent(this.id);
         while (parent !== null) {
-            path = `${parent.name} / ${path}`;
+            path.unshift(parent.name);
             parent = await Monitor.getParent(parent.id);
         }
 
diff --git a/src/pages/Details.vue b/src/pages/Details.vue
index 1eb9a7f6..8582b82c 100644
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@@ -390,10 +390,7 @@ export default {
         },
 
         group() {
-            if (!this.monitor.pathName.includes("/")) {
-                return "";
-            }
-            return this.monitor.pathName.substr(0, this.monitor.pathName.lastIndexOf("/"));
+            return this.monitor.path.slice(0, -1).join(" / ");
         },
 
         pushURL() {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 66616299..72cb181e 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -1395,6 +1395,7 @@ message HealthCheckResponse {
                             // group monitor fields
                             this.monitor.childrenIDs = undefined;
                             this.monitor.forceInactive = undefined;
+                            this.monitor.path = undefined;
                             this.monitor.pathName = undefined;
                             this.monitor.screenshot = undefined;
 

From daa59b812c0aaf334462481043bc8bdd7b6ae3d7 Mon Sep 17 00:00:00 2001
From: Humberto Evans <hevans66@gmail.com>
Date: Mon, 4 Mar 2024 14:54:17 -0800
Subject: [PATCH 38/45] Update en.json

Fix misspelled "Trigger"
---
 src/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 9e495a68..6b77b65f 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -884,6 +884,6 @@
     "GrafanaOncallUrl": "Grafana Oncall URL",
     "Browser Screenshot": "Browser Screenshot",
     "What is a Remote Browser?": "What is a Remote Browser?",
-    "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}",
+    "wayToGetHeiiOnCallDetails": "How to get the Trigger ID and API Keys is explained in the {documentation}",
     "documentationOf": "{0} Documentation"
 }

From 4aaa0b92fb96ff6c47d50e42451c085dfb493f16 Mon Sep 17 00:00:00 2001
From: taschenuhr <mail@meneldor.de>
Date: Thu, 7 Mar 2024 15:11:19 +0100
Subject: [PATCH 39/45] fix test notification after method refactoring

---
 server/notification-providers/teams.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index e8aab1a4..bf2cd764 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -52,7 +52,7 @@ class Teams extends NotificationProvider {
         monitorUrl,
         dashboardUrl,
     }) => {
-        const status = heartbeatJSON.status;
+        const status = heartbeatJSON?.status;
         const facts = [];
         const actions = [];
 
@@ -196,7 +196,9 @@ class Teams extends NotificationProvider {
      */
     _handleGeneralNotification = (webhookUrl, msg) => {
         const payload = this._notificationPayloadFactory({
-            monitorMessage: msg
+            heartbeatJSON: {
+                msg: msg
+            }
         });
 
         return this._sendNotification(webhookUrl, payload);

From a9a1cf1353d41bc81ddd5c84a593efdaab03a590 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 14 Mar 2024 14:21:15 +0100
Subject: [PATCH 40/45] Chore: General notification reformatting (#3182)

- I unified where in file the name of `NotificationProvider.name` is placed
- I made sure that all the providers adhere to the signature of `NotificationProvider.send()`
- I made sure that all the providers use `okMsg` if returning success messages directly from the function.
  Here a discussion should be had:
  Should this be refactored into a constant of `NotificationProvider`? I could imagine that `NotificationProvider.SENDING_SUCCESSFULL`  could be a suitable alternative.
- I made sure all providers have the URL they `POST`/`GET` to be extraced into a variable.
  => refactored this way due to Nelsons suggestion
---
 server/monitor-types/monitor-type.js          |  1 -
 server/notification-providers/alerta.js       | 10 +++----
 server/notification-providers/alertnow.js     |  4 +--
 server/notification-providers/aliyun-sms.js   |  2 +-
 server/notification-providers/apprise.js      |  5 ++--
 server/notification-providers/bark.js         | 23 +++++++--------
 server/notification-providers/clicksendsms.js |  7 +++--
 server/notification-providers/dingding.js     |  2 +-
 server/notification-providers/discord.js      |  3 +-
 server/notification-providers/feishu.js       |  9 +++---
 server/notification-providers/freemobile.js   |  4 +--
 server/notification-providers/goalert.js      |  8 ++---
 server/notification-providers/google-chat.js  |  4 +--
 server/notification-providers/gorush.js       |  3 +-
 server/notification-providers/gotify.js       |  4 +--
 .../notification-providers/grafana-oncall.js  | 18 +++---------
 .../notification-providers/home-assistant.js  | 12 ++++----
 server/notification-providers/kook.js         |  6 ++--
 server/notification-providers/line.js         | 12 ++++----
 server/notification-providers/linenotify.js   | 12 ++++----
 server/notification-providers/lunasea.js      | 29 ++++++++++++-------
 server/notification-providers/matrix.js       |  2 +-
 server/notification-providers/mattermost.js   |  9 ++----
 server/notification-providers/ntfy.js         |  8 ++---
 server/notification-providers/octopush.js     |  9 +++---
 server/notification-providers/onebot.js       | 18 ++++++------
 server/notification-providers/opsgenie.js     |  3 +-
 server/notification-providers/promosms.js     |  6 ++--
 server/notification-providers/pushbullet.js   | 11 ++++---
 server/notification-providers/pushdeer.js     | 10 +++----
 server/notification-providers/pushover.js     |  9 +++---
 server/notification-providers/pushy.js        |  3 +-
 server/notification-providers/rocket-chat.js  |  4 +--
 server/notification-providers/serverchan.js   |  4 +--
 server/notification-providers/serwersms.js    |  6 ++--
 server/notification-providers/signal.js       |  3 +-
 server/notification-providers/slack.js        |  3 +-
 server/notification-providers/smsc.js         |  6 ++--
 server/notification-providers/smseagle.js     |  3 +-
 server/notification-providers/smsmanager.js   | 13 +++++----
 server/notification-providers/smtp.js         |  4 +--
 server/notification-providers/squadcast.js    |  3 +-
 server/notification-providers/stackfield.js   |  6 ++--
 server/notification-providers/teams.js        |  2 +-
 .../notification-providers/techulus-push.js   |  3 +-
 server/notification-providers/telegram.js     |  6 ++--
 server/notification-providers/twilio.js       | 15 +++-------
 server/notification-providers/webhook.js      |  3 +-
 server/notification-providers/wecom.js        |  6 ++--
 server/notification-providers/zoho-cliq.js    |  3 +-
 50 files changed, 165 insertions(+), 194 deletions(-)

diff --git a/server/monitor-types/monitor-type.js b/server/monitor-types/monitor-type.js
index 782bedd5..eb75307b 100644
--- a/server/monitor-types/monitor-type.js
+++ b/server/monitor-types/monitor-type.js
@@ -1,5 +1,4 @@
 class MonitorType {
-
     name = undefined;
 
     /**
diff --git a/server/notification-providers/alerta.js b/server/notification-providers/alerta.js
index 62092178..f9a273b4 100644
--- a/server/notification-providers/alerta.js
+++ b/server/notification-providers/alerta.js
@@ -3,17 +3,15 @@ const { DOWN, UP } = require("../../src/util");
 const axios = require("axios");
 
 class Alerta extends NotificationProvider {
-
     name = "alerta";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
-            let alertaUrl = `${notification.alertaApiEndpoint}`;
             let config = {
                 headers: {
                     "Content-Type": "application/json;charset=UTF-8",
@@ -40,7 +38,7 @@ class Alerta extends NotificationProvider {
                     resource: "Message",
                 }, data);
 
-                await axios.post(alertaUrl, postData, config);
+                await axios.post(notification.alertaApiEndpoint, postData, config);
             } else {
                 let datadup = Object.assign( {
                     correlate: [ "service_up", "service_down" ],
@@ -52,11 +50,11 @@ class Alerta extends NotificationProvider {
                 if (heartbeatJSON["status"] === DOWN) {
                     datadup.severity = notification.alertaAlertState; // critical
                     datadup.text = "Service " + monitorJSON["type"] + " is down.";
-                    await axios.post(alertaUrl, datadup, config);
+                    await axios.post(notification.alertaApiEndpoint, datadup, config);
                 } else if (heartbeatJSON["status"] === UP) {
                     datadup.severity = notification.alertaRecoverState; // cleaned
                     datadup.text = "Service " + monitorJSON["type"] + " is up.";
-                    await axios.post(alertaUrl, datadup, config);
+                    await axios.post(notification.alertaApiEndpoint, datadup, config);
                 }
             }
             return okMsg;
diff --git a/server/notification-providers/alertnow.js b/server/notification-providers/alertnow.js
index 1206b72e..4257ca9c 100644
--- a/server/notification-providers/alertnow.js
+++ b/server/notification-providers/alertnow.js
@@ -4,14 +4,14 @@ const { setting } = require("../util-server");
 const { getMonitorRelativeURL, UP, DOWN } = require("../../src/util");
 
 class AlertNow extends NotificationProvider {
-
     name = "AlertNow";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             let textMsg = "";
             let status = "open";
diff --git a/server/notification-providers/aliyun-sms.js b/server/notification-providers/aliyun-sms.js
index 1718bbfe..b895f70a 100644
--- a/server/notification-providers/aliyun-sms.js
+++ b/server/notification-providers/aliyun-sms.js
@@ -11,7 +11,7 @@ class AliyunSMS extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON != null) {
diff --git a/server/notification-providers/apprise.js b/server/notification-providers/apprise.js
index 5e4d23c3..0f698214 100644
--- a/server/notification-providers/apprise.js
+++ b/server/notification-providers/apprise.js
@@ -2,13 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const childProcessAsync = require("promisify-child-process");
 
 class Apprise extends NotificationProvider {
-
     name = "apprise";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+
         const args = [ "-vv", "-b", msg, notification.appriseURL ];
         if (notification.title) {
             args.push("-t");
@@ -23,7 +24,7 @@ class Apprise extends NotificationProvider {
         if (output) {
 
             if (! output.includes("ERROR")) {
-                return "Sent Successfully";
+                return okMsg;
             }
 
             throw new Error(output);
diff --git a/server/notification-providers/bark.js b/server/notification-providers/bark.js
index 7fe9a7a9..4d6c0ae0 100644
--- a/server/notification-providers/bark.js
+++ b/server/notification-providers/bark.js
@@ -46,29 +46,29 @@ class Bark extends NotificationProvider {
     }
 
     /**
-     * Add additional parameter for Bark v1 endpoints
+     * Add additional parameter for Bark v1 endpoints.
+     * Leads to better on device styles (iOS 15 optimized)
      * @param {BeanModel} notification Notification to send
-     * @param {string} postUrl URL to append parameters to
      * @returns {string} Additional URL parameters
      */
-    appendAdditionalParameters(notification, postUrl) {
+    additionalParameters(notification) {
         // set icon to uptime kuma icon, 11kb should be fine
-        postUrl += "?icon=" + barkNotificationAvatar;
+        let params = "?icon=" + barkNotificationAvatar;
         // grouping all our notifications
         if (notification.barkGroup != null) {
-            postUrl += "&group=" + notification.barkGroup;
+            params += "&group=" + notification.barkGroup;
         } else {
             // default name
-            postUrl += "&group=" + "UptimeKuma";
+            params += "&group=" + "UptimeKuma";
         }
         // picked a sound, this should follow system's mute status when arrival
         if (notification.barkSound != null) {
-            postUrl += "&sound=" + notification.barkSound;
+            params += "&sound=" + notification.barkSound;
         } else {
             // default sound
-            postUrl += "&sound=" + "telegraph";
+            params += "&sound=" + "telegraph";
         }
-        return postUrl;
+        return params;
     }
 
     /**
@@ -100,9 +100,8 @@ class Bark extends NotificationProvider {
             // url encode title and subtitle
             title = encodeURIComponent(title);
             subtitle = encodeURIComponent(subtitle);
-            let postUrl = endpoint + "/" + title + "/" + subtitle;
-            postUrl = this.appendAdditionalParameters(notification, postUrl);
-            result = await axios.get(postUrl);
+            const params = this.additionalParameters(notification);
+            result = await axios.get(`${endpoint}/${title}/${subtitle}${params}`);
         } else {
             result = await axios.post(`${endpoint}/push`, {
                 title,
diff --git a/server/notification-providers/clicksendsms.js b/server/notification-providers/clicksendsms.js
index 5539a6a4..c090b7f3 100644
--- a/server/notification-providers/clicksendsms.js
+++ b/server/notification-providers/clicksendsms.js
@@ -2,14 +2,15 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class ClickSendSMS extends NotificationProvider {
-
     name = "clicksendsms";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://rest.clicksend.com/v3/sms/send";
+
         try {
             let config = {
                 headers: {
@@ -28,7 +29,7 @@ class ClickSendSMS extends NotificationProvider {
                     }
                 ]
             };
-            let resp = await axios.post("https://rest.clicksend.com/v3/sms/send", data, config);
+            let resp = await axios.post(url, data, config);
             if (resp.data.data.messages[0].status !== "SUCCESS") {
                 let error = "Something gone wrong. Api returned " + resp.data.data.messages[0].status + ".";
                 this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index be3a2fbc..3aa81922 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -10,7 +10,7 @@ class DingDing extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON != null) {
diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js
index f24cd616..f24d4725 100644
--- a/server/notification-providers/discord.js
+++ b/server/notification-providers/discord.js
@@ -3,14 +3,13 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class Discord extends NotificationProvider {
-
     name = "discord";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             const discordDisplayName = notification.discordUsername || "Uptime Kuma";
diff --git a/server/notification-providers/feishu.js b/server/notification-providers/feishu.js
index dd5ce295..23af6911 100644
--- a/server/notification-providers/feishu.js
+++ b/server/notification-providers/feishu.js
@@ -9,8 +9,7 @@ class Feishu extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
-        let feishuWebHookUrl = notification.feishuWebHookUrl;
+        const okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON == null) {
@@ -20,7 +19,7 @@ class Feishu extends NotificationProvider {
                         text: msg,
                     },
                 };
-                await axios.post(feishuWebHookUrl, testdata);
+                await axios.post(notification.feishuWebHookUrl, testdata);
                 return okMsg;
             }
 
@@ -46,7 +45,7 @@ class Feishu extends NotificationProvider {
                         },
                     },
                 };
-                await axios.post(feishuWebHookUrl, downdata);
+                await axios.post(notification.feishuWebHookUrl, downdata);
                 return okMsg;
             }
 
@@ -72,7 +71,7 @@ class Feishu extends NotificationProvider {
                         },
                     },
                 };
-                await axios.post(feishuWebHookUrl, updata);
+                await axios.post(notification.feishuWebHookUrl, updata);
                 return okMsg;
             }
         } catch (error) {
diff --git a/server/notification-providers/freemobile.js b/server/notification-providers/freemobile.js
index 44c55bfd..4de45acd 100644
--- a/server/notification-providers/freemobile.js
+++ b/server/notification-providers/freemobile.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class FreeMobile extends NotificationProvider {
-
     name = "FreeMobile";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             await axios.post(`https://smsapi.free-mobile.fr/sendmsg?msg=${encodeURIComponent(msg.replace("🔴", "⛔️"))}`, {
                 "user": notification.freemobileUser,
diff --git a/server/notification-providers/goalert.js b/server/notification-providers/goalert.js
index abf77924..847c6a00 100644
--- a/server/notification-providers/goalert.js
+++ b/server/notification-providers/goalert.js
@@ -3,21 +3,20 @@ const axios = require("axios");
 const { UP } = require("../../src/util");
 
 class GoAlert extends NotificationProvider {
-
     name = "GoAlert";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
-            let closeAction = "close";
             let data = {
                 summary: msg,
             };
             if (heartbeatJSON != null && heartbeatJSON["status"] === UP) {
-                data["action"] = closeAction;
+                data["action"] = "close";
             }
             let headers = {
                 "Content-Type": "multipart/form-data",
@@ -27,7 +26,6 @@ class GoAlert extends NotificationProvider {
             };
             await axios.post(`${notification.goAlertBaseURL}/api/v2/generic/incoming?token=${notification.goAlertToken}`, data, config);
             return okMsg;
-
         } catch (error) {
             let msg = (error.response.data) ? error.response.data : "Error without response";
             throw new Error(msg);
diff --git a/server/notification-providers/google-chat.js b/server/notification-providers/google-chat.js
index 413fde26..9f1b53b7 100644
--- a/server/notification-providers/google-chat.js
+++ b/server/notification-providers/google-chat.js
@@ -5,14 +5,14 @@ const { getMonitorRelativeURL } = require("../../src/util");
 const { DOWN, UP } = require("../../src/util");
 
 class GoogleChat extends NotificationProvider {
-
     name = "GoogleChat";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             // Google Chat message formatting: https://developers.google.com/chat/api/guides/message-formats/basic
 
diff --git a/server/notification-providers/gorush.js b/server/notification-providers/gorush.js
index 28f03ab9..ba9d470f 100644
--- a/server/notification-providers/gorush.js
+++ b/server/notification-providers/gorush.js
@@ -2,14 +2,13 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Gorush extends NotificationProvider {
-
     name = "gorush";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         let platformMapping = {
             "ios": 1,
diff --git a/server/notification-providers/gotify.js b/server/notification-providers/gotify.js
index 3e99b3d1..a52ef511 100644
--- a/server/notification-providers/gotify.js
+++ b/server/notification-providers/gotify.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Gotify extends NotificationProvider {
-
     name = "gotify";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             if (notification.gotifyserverurl && notification.gotifyserverurl.endsWith("/")) {
                 notification.gotifyserverurl = notification.gotifyserverurl.slice(0, -1);
diff --git a/server/notification-providers/grafana-oncall.js b/server/notification-providers/grafana-oncall.js
index ee1bfd47..e93c77cd 100644
--- a/server/notification-providers/grafana-oncall.js
+++ b/server/notification-providers/grafana-oncall.js
@@ -3,19 +3,18 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class GrafanaOncall extends NotificationProvider {
-
     name = "GrafanaOncall";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
 
         if (!notification.GrafanaOncallURL) {
             throw new Error("GrafanaOncallURL cannot be empty");
         }
 
-        let okMsg = "Sent Successfully.";
         try {
             if (heartbeatJSON === null) {
                 let grafanaupdata = {
@@ -23,10 +22,7 @@ class GrafanaOncall extends NotificationProvider {
                     message: msg,
                     state: "alerting",
                 };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanaupdata
-                );
+                await axios.post(notification.GrafanaOncallURL, grafanaupdata);
                 return okMsg;
             } else if (heartbeatJSON["status"] === DOWN) {
                 let grafanadowndata = {
@@ -34,10 +30,7 @@ class GrafanaOncall extends NotificationProvider {
                     message: heartbeatJSON["msg"],
                     state: "alerting",
                 };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanadowndata
-                );
+                await axios.post(notification.GrafanaOncallURL, grafanadowndata);
                 return okMsg;
             } else if (heartbeatJSON["status"] === UP) {
                 let grafanaupdata = {
@@ -45,10 +38,7 @@ class GrafanaOncall extends NotificationProvider {
                     message: heartbeatJSON["msg"],
                     state: "ok",
                 };
-                await axios.post(
-                    notification.GrafanaOncallURL,
-                    grafanaupdata
-                );
+                await axios.post(notification.GrafanaOncallURL, grafanaupdata);
                 return okMsg;
             }
         } catch (error) {
diff --git a/server/notification-providers/home-assistant.js b/server/notification-providers/home-assistant.js
index 292fc3e6..ee95ba0b 100644
--- a/server/notification-providers/home-assistant.js
+++ b/server/notification-providers/home-assistant.js
@@ -9,7 +9,9 @@ class HomeAssistant extends NotificationProvider {
     /**
      * @inheritdoc
      */
-    async send(notification, message, monitor = null, heartbeat = null) {
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+
         const notificationService = notification?.notificationService || defaultNotificationService;
 
         try {
@@ -17,10 +19,10 @@ class HomeAssistant extends NotificationProvider {
                 `${notification.homeAssistantUrl.trim().replace(/\/*$/, "")}/api/services/notify/${notificationService}`,
                 {
                     title: "Uptime Kuma",
-                    message,
+                    message: msg,
                     ...(notificationService !== "persistent_notification" && { data: {
-                        name: monitor?.name,
-                        status: heartbeat?.status,
+                        name: monitorJSON?.name,
+                        status: heartbeatJSON?.status,
                     } }),
                 },
                 {
@@ -31,7 +33,7 @@ class HomeAssistant extends NotificationProvider {
                 }
             );
 
-            return "Sent Successfully.";
+            return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
diff --git a/server/notification-providers/kook.js b/server/notification-providers/kook.js
index b9b68f43..dab19513 100644
--- a/server/notification-providers/kook.js
+++ b/server/notification-providers/kook.js
@@ -2,15 +2,15 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Kook extends NotificationProvider {
-
     name = "Kook";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
-        let url = "https://www.kookapp.cn/api/v3/message/create";
+        const okMsg = "Sent Successfully.";
+        const url = "https://www.kookapp.cn/api/v3/message/create";
+
         let data = {
             target_id: notification.kookGuildID,
             content: msg,
diff --git a/server/notification-providers/line.js b/server/notification-providers/line.js
index 73dc962f..57dc87e7 100644
--- a/server/notification-providers/line.js
+++ b/server/notification-providers/line.js
@@ -3,16 +3,16 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class Line extends NotificationProvider {
-
     name = "line";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.line.me/v2/bot/message/push";
+
         try {
-            let lineAPIUrl = "https://api.line.me/v2/bot/message/push";
             let config = {
                 headers: {
                     "Content-Type": "application/json",
@@ -29,7 +29,7 @@ class Line extends NotificationProvider {
                         }
                     ]
                 };
-                await axios.post(lineAPIUrl, testMessage, config);
+                await axios.post(url, testMessage, config);
             } else if (heartbeatJSON["status"] === DOWN) {
                 let downMessage = {
                     "to": notification.lineUserID,
@@ -43,7 +43,7 @@ class Line extends NotificationProvider {
                         }
                     ]
                 };
-                await axios.post(lineAPIUrl, downMessage, config);
+                await axios.post(url, downMessage, config);
             } else if (heartbeatJSON["status"] === UP) {
                 let upMessage = {
                     "to": notification.lineUserID,
@@ -57,7 +57,7 @@ class Line extends NotificationProvider {
                         }
                     ]
                 };
-                await axios.post(lineAPIUrl, upMessage, config);
+                await axios.post(url, upMessage, config);
             }
             return okMsg;
         } catch (error) {
diff --git a/server/notification-providers/linenotify.js b/server/notification-providers/linenotify.js
index dfe7e598..2622e3f1 100644
--- a/server/notification-providers/linenotify.js
+++ b/server/notification-providers/linenotify.js
@@ -4,16 +4,16 @@ const qs = require("qs");
 const { DOWN, UP } = require("../../src/util");
 
 class LineNotify extends NotificationProvider {
-
     name = "LineNotify";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://notify-api.line.me/api/notify";
+
         try {
-            let lineAPIUrl = "https://notify-api.line.me/api/notify";
             let config = {
                 headers: {
                     "Content-Type": "application/x-www-form-urlencoded",
@@ -24,7 +24,7 @@ class LineNotify extends NotificationProvider {
                 let testMessage = {
                     "message": msg,
                 };
-                await axios.post(lineAPIUrl, qs.stringify(testMessage), config);
+                await axios.post(url, qs.stringify(testMessage), config);
             } else if (heartbeatJSON["status"] === DOWN) {
                 let downMessage = {
                     "message": "\n[🔴 Down]\n" +
@@ -32,7 +32,7 @@ class LineNotify extends NotificationProvider {
                         heartbeatJSON["msg"] + "\n" +
                         `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
-                await axios.post(lineAPIUrl, qs.stringify(downMessage), config);
+                await axios.post(url, qs.stringify(downMessage), config);
             } else if (heartbeatJSON["status"] === UP) {
                 let upMessage = {
                     "message": "\n[✅ Up]\n" +
@@ -40,7 +40,7 @@ class LineNotify extends NotificationProvider {
                         heartbeatJSON["msg"] + "\n" +
                         `Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
-                await axios.post(lineAPIUrl, qs.stringify(upMessage), config);
+                await axios.post(url, qs.stringify(upMessage), config);
             }
             return okMsg;
         } catch (error) {
diff --git a/server/notification-providers/lunasea.js b/server/notification-providers/lunasea.js
index 3729b0fe..787a704a 100644
--- a/server/notification-providers/lunasea.js
+++ b/server/notification-providers/lunasea.js
@@ -3,28 +3,23 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class LunaSea extends NotificationProvider {
-
     name = "lunasea";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
-        let lunaseaurl = "";
-        if (notification.lunaseaTarget === "user") {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/user/" + notification.lunaseaUserID;
-        } else {
-            lunaseaurl = "https://notify.lunasea.app/v1/custom/device/" + notification.lunaseaDevice;
-        }
+        const okMsg = "Sent Successfully.";
+        const url = "https://notify.lunasea.app/v1";
 
         try {
+            const target = this.getTarget(notification);
             if (heartbeatJSON == null) {
                 let testdata = {
                     "title": "Uptime Kuma Alert",
                     "body": msg,
                 };
-                await axios.post(lunaseaurl, testdata);
+                await axios.post(`${url}/custom/${target}`, testdata);
                 return okMsg;
             }
 
@@ -35,7 +30,7 @@ class LunaSea extends NotificationProvider {
                         heartbeatJSON["msg"] +
                         `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
-                await axios.post(lunaseaurl, downdata);
+                await axios.post(`${url}/custom/${target}`, downdata);
                 return okMsg;
             }
 
@@ -46,13 +41,25 @@ class LunaSea extends NotificationProvider {
                         heartbeatJSON["msg"] +
                         `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`
                 };
-                await axios.post(lunaseaurl, updata);
+                await axios.post(`${url}/custom/${target}`, updata);
                 return okMsg;
             }
 
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
+    }
+
+    /**
+     * Generates the lunasea target to send the notification to
+     * @param {BeanModel} notification Notification details
+     * @returns {string} The target to send the notification to
+     */
+    getTarget(notification) {
+        if (notification.lunaseaTarget === "user") {
+            return "user/" + notification.lunaseaUserID;
+        }
+        return "device/" + notification.lunaseaDevice;
 
     }
 }
diff --git a/server/notification-providers/matrix.js b/server/notification-providers/matrix.js
index c9baf48b..805a4947 100644
--- a/server/notification-providers/matrix.js
+++ b/server/notification-providers/matrix.js
@@ -10,7 +10,7 @@ class Matrix extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         const size = 20;
         const randomString = encodeURIComponent(
diff --git a/server/notification-providers/mattermost.js b/server/notification-providers/mattermost.js
index 5a6a8e2c..9946d02b 100644
--- a/server/notification-providers/mattermost.js
+++ b/server/notification-providers/mattermost.js
@@ -3,14 +3,14 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class Mattermost extends NotificationProvider {
-
     name = "mattermost";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             const mattermostUserName = notification.mattermostusername || "Uptime Kuma";
             // If heartbeatJSON is null, assume non monitoring notification (Certificate warning) or testing.
@@ -98,10 +98,7 @@ class Mattermost extends NotificationProvider {
                     },
                 ],
             };
-            await axios.post(
-                notification.mattermostWebhookUrl,
-                mattermostdata
-            );
+            await axios.post(notification.mattermostWebhookUrl, mattermostdata);
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/ntfy.js b/server/notification-providers/ntfy.js
index 12c9258b..ad1d39f8 100644
--- a/server/notification-providers/ntfy.js
+++ b/server/notification-providers/ntfy.js
@@ -3,14 +3,14 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class Ntfy extends NotificationProvider {
-
     name = "ntfy";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             let headers = {};
             if (notification.ntfyAuthenticationMethod === "usernamePassword") {
@@ -31,7 +31,7 @@ class Ntfy extends NotificationProvider {
                     "priority": notification.ntfyPriority,
                     "tags": [ "test_tube" ],
                 };
-                await axios.post(`${notification.ntfyserverurl}`, ntfyTestData, { headers: headers });
+                await axios.post(notification.ntfyserverurl, ntfyTestData, { headers: headers });
                 return okMsg;
             }
             let tags = [];
@@ -70,7 +70,7 @@ class Ntfy extends NotificationProvider {
                 data.icon = notification.ntfyIcon;
             }
 
-            await axios.post(`${notification.ntfyserverurl}`, data, { headers: headers });
+            await axios.post(notification.ntfyserverurl, data, { headers: headers });
 
             return okMsg;
 
diff --git a/server/notification-providers/octopush.js b/server/notification-providers/octopush.js
index ec62cd3a..7576e0ad 100644
--- a/server/notification-providers/octopush.js
+++ b/server/notification-providers/octopush.js
@@ -2,14 +2,15 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Octopush extends NotificationProvider {
-
     name = "octopush";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const urlV2 = "https://api.octopush.com/v1/public/sms-campaign/send";
+        const urlV1 = "https://www.octopush-dm.com/api/sms/json";
 
         try {
         // Default - V2
@@ -33,7 +34,7 @@ class Octopush extends NotificationProvider {
                     "purpose": "alert",
                     "sender": notification.octopushSenderName
                 };
-                await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config);
+                await axios.post(urlV2, data, config);
             } else if (notification.octopushVersion === "1") {
                 let data = {
                     "user_login": notification.octopushDMLogin,
@@ -55,7 +56,7 @@ class Octopush extends NotificationProvider {
 
                 // V1 API returns 200 even on error so we must check
                 // response data
-                let response = await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config);
+                let response = await axios.post(urlV1, {}, config);
                 if ("error_code" in response.data) {
                     if (response.data.error_code !== "000") {
                         this.throwGeneralAxiosError(`Octopush error ${JSON.stringify(response.data)}`);
diff --git a/server/notification-providers/onebot.js b/server/notification-providers/onebot.js
index ec7fc46d..b04794de 100644
--- a/server/notification-providers/onebot.js
+++ b/server/notification-providers/onebot.js
@@ -2,23 +2,23 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class OneBot extends NotificationProvider {
-
     name = "OneBot";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
-            let httpAddr = notification.httpAddr;
-            if (!httpAddr.startsWith("http")) {
-                httpAddr = "http://" + httpAddr;
+            let url = notification.httpAddr;
+            if (!url.startsWith("http")) {
+                url = "http://" + url;
             }
-            if (!httpAddr.endsWith("/")) {
-                httpAddr += "/";
+            if (!url.endsWith("/")) {
+                url += "/";
             }
-            let onebotAPIUrl = httpAddr + "send_msg";
+            url += "send_msg";
             let config = {
                 headers: {
                     "Content-Type": "application/json",
@@ -37,7 +37,7 @@ class OneBot extends NotificationProvider {
                 data["message_type"] = "private";
                 data["user_id"] = notification.recieverId;
             }
-            await axios.post(onebotAPIUrl, data, config);
+            await axios.post(url, data, config);
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/opsgenie.js b/server/notification-providers/opsgenie.js
index e2dc38a7..59a79705 100644
--- a/server/notification-providers/opsgenie.js
+++ b/server/notification-providers/opsgenie.js
@@ -4,10 +4,9 @@ const { UP, DOWN } = require("../../src/util");
 
 const opsgenieAlertsUrlEU = "https://api.eu.opsgenie.com/v2/alerts";
 const opsgenieAlertsUrlUS = "https://api.opsgenie.com/v2/alerts";
-let okMsg = "Sent Successfully.";
+const okMsg = "Sent Successfully.";
 
 class Opsgenie extends NotificationProvider {
-
     name = "Opsgenie";
 
     /**
diff --git a/server/notification-providers/promosms.js b/server/notification-providers/promosms.js
index 7ec91971..05334e90 100644
--- a/server/notification-providers/promosms.js
+++ b/server/notification-providers/promosms.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class PromoSMS extends NotificationProvider {
-
     name = "promosms";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://promosms.com/api/rest/v3_2/sms";
 
         if (notification.promosmsAllowLongSMS === undefined) {
             notification.promosmsAllowLongSMS = false;
@@ -36,7 +36,7 @@ class PromoSMS extends NotificationProvider {
                 "sender": notification.promosmsSenderName
             };
 
-            let resp = await axios.post("https://promosms.com/api/rest/v3_2/sms", data, config);
+            let resp = await axios.post(url, data, config);
 
             if (resp.data.response.status !== 0) {
                 let error = "Something gone wrong. Api returned " + resp.data.response.status + ".";
diff --git a/server/notification-providers/pushbullet.js b/server/notification-providers/pushbullet.js
index 9fbd4d4c..0b730310 100644
--- a/server/notification-providers/pushbullet.js
+++ b/server/notification-providers/pushbullet.js
@@ -4,17 +4,16 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class Pushbullet extends NotificationProvider {
-
     name = "pushbullet";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.pushbullet.com/v2/pushes";
 
         try {
-            let pushbulletUrl = "https://api.pushbullet.com/v2/pushes";
             let config = {
                 headers: {
                     "Access-Token": notification.pushbulletAccessToken,
@@ -27,7 +26,7 @@ class Pushbullet extends NotificationProvider {
                     "title": "Uptime Kuma Alert",
                     "body": msg,
                 };
-                await axios.post(pushbulletUrl, data, config);
+                await axios.post(url, data, config);
             } else if (heartbeatJSON["status"] === DOWN) {
                 let downData = {
                     "type": "note",
@@ -36,7 +35,7 @@ class Pushbullet extends NotificationProvider {
                         heartbeatJSON["msg"] +
                         `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                 };
-                await axios.post(pushbulletUrl, downData, config);
+                await axios.post(url, downData, config);
             } else if (heartbeatJSON["status"] === UP) {
                 let upData = {
                     "type": "note",
@@ -45,7 +44,7 @@ class Pushbullet extends NotificationProvider {
                         heartbeatJSON["msg"] +
                         `\nTime (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                 };
-                await axios.post(pushbulletUrl, upData, config);
+                await axios.post(url, upData, config);
             }
             return okMsg;
         } catch (error) {
diff --git a/server/notification-providers/pushdeer.js b/server/notification-providers/pushdeer.js
index 78525a54..276c2f47 100644
--- a/server/notification-providers/pushdeer.js
+++ b/server/notification-providers/pushdeer.js
@@ -3,17 +3,15 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class PushDeer extends NotificationProvider {
-
     name = "PushDeer";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
-        let endpoint = "/message/push";
-        let serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
-        let pushdeerlink = `${serverUrl.trim().replace(/\/*$/, "")}${endpoint}`;
+        const okMsg = "Sent Successfully.";
+        const serverUrl = notification.pushdeerServer || "https://api2.pushdeer.com";
+        const url = `${serverUrl.trim().replace(/\/*$/, "")}/message/push`;
 
         let valid = msg != null && monitorJSON != null && heartbeatJSON != null;
 
@@ -34,7 +32,7 @@ class PushDeer extends NotificationProvider {
         };
 
         try {
-            let res = await axios.post(pushdeerlink, data);
+            let res = await axios.post(url, data);
 
             if ("error" in res.data) {
                 let error = res.data.error;
diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index 31f8d885..304aa351 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -2,15 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Pushover extends NotificationProvider {
-
     name = "pushover";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
-        let pushoverlink = "https://api.pushover.net/1/messages.json";
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.pushover.net/1/messages.json";
 
         let data = {
             "message": msg,
@@ -33,11 +32,11 @@ class Pushover extends NotificationProvider {
 
         try {
             if (heartbeatJSON == null) {
-                await axios.post(pushoverlink, data);
+                await axios.post(url, data);
                 return okMsg;
             } else {
                 data.message += `\n<b>Time (${heartbeatJSON["timezone"]})</b>:${heartbeatJSON["localDateTime"]}`;
-                await axios.post(pushoverlink, data);
+                await axios.post(url, data);
                 return okMsg;
             }
         } catch (error) {
diff --git a/server/notification-providers/pushy.js b/server/notification-providers/pushy.js
index afb9e617..cb700229 100644
--- a/server/notification-providers/pushy.js
+++ b/server/notification-providers/pushy.js
@@ -2,14 +2,13 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Pushy extends NotificationProvider {
-
     name = "pushy";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             await axios.post(`https://api.pushy.me/push?api_key=${notification.pushyAPIKey}`, {
diff --git a/server/notification-providers/rocket-chat.js b/server/notification-providers/rocket-chat.js
index 13b39cde..690e33a8 100644
--- a/server/notification-providers/rocket-chat.js
+++ b/server/notification-providers/rocket-chat.js
@@ -5,14 +5,14 @@ const { setting } = require("../util-server");
 const { getMonitorRelativeURL, DOWN } = require("../../src/util");
 
 class RocketChat extends NotificationProvider {
-
     name = "rocket.chat";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             if (heartbeatJSON == null) {
                 let data = {
diff --git a/server/notification-providers/serverchan.js b/server/notification-providers/serverchan.js
index 2315e1c3..cefe61f1 100644
--- a/server/notification-providers/serverchan.js
+++ b/server/notification-providers/serverchan.js
@@ -3,14 +3,14 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class ServerChan extends NotificationProvider {
-
     name = "ServerChan";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+
         try {
             await axios.post(`https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`, {
                 "title": this.checkStatus(heartbeatJSON, monitorJSON),
diff --git a/server/notification-providers/serwersms.js b/server/notification-providers/serwersms.js
index 76e1ef2c..f7c8644a 100644
--- a/server/notification-providers/serwersms.js
+++ b/server/notification-providers/serwersms.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class SerwerSMS extends NotificationProvider {
-
     name = "serwersms";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://api2.serwersms.pl/messages/send_sms";
 
         try {
             let config = {
@@ -25,7 +25,7 @@ class SerwerSMS extends NotificationProvider {
                 "sender": notification.serwersmsSenderName,
             };
 
-            let resp = await axios.post("https://api2.serwersms.pl/messages/send_sms", data, config);
+            let resp = await axios.post(url, data, config);
 
             if (!resp.data.success) {
                 if (resp.data.error) {
diff --git a/server/notification-providers/signal.js b/server/notification-providers/signal.js
index c445ee82..9702d06b 100644
--- a/server/notification-providers/signal.js
+++ b/server/notification-providers/signal.js
@@ -2,14 +2,13 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Signal extends NotificationProvider {
-
     name = "signal";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             let data = {
diff --git a/server/notification-providers/slack.js b/server/notification-providers/slack.js
index d512a7cd..9347b07c 100644
--- a/server/notification-providers/slack.js
+++ b/server/notification-providers/slack.js
@@ -4,7 +4,6 @@ const { setSettings, setting } = require("../util-server");
 const { getMonitorRelativeURL, UP } = require("../../src/util");
 
 class Slack extends NotificationProvider {
-
     name = "slack";
 
     /**
@@ -31,7 +30,7 @@ class Slack extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         if (notification.slackchannelnotify) {
             msg += " <!channel>";
diff --git a/server/notification-providers/smsc.js b/server/notification-providers/smsc.js
index 34d9c8fa..89f01d01 100644
--- a/server/notification-providers/smsc.js
+++ b/server/notification-providers/smsc.js
@@ -8,7 +8,9 @@ class SMSC extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://smsc.kz/sys/send.php?";
+
         try {
             let config = {
                 headers: {
@@ -29,7 +31,7 @@ class SMSC extends NotificationProvider {
                 getArray.push("sender=" + notification.smscSenderName);
             }
 
-            let resp = await axios.get("https://smsc.kz/sys/send.php?" + getArray.join("&"), config);
+            let resp = await axios.get(url + getArray.join("&"), config);
             if (resp.data.id === undefined) {
                 let error = `Something gone wrong. Api returned code ${resp.data.error_code}: ${resp.data.error}`;
                 this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/smseagle.js b/server/notification-providers/smseagle.js
index 988f17fd..4e897006 100644
--- a/server/notification-providers/smseagle.js
+++ b/server/notification-providers/smseagle.js
@@ -2,14 +2,13 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class SMSEagle extends NotificationProvider {
-
     name = "SMSEagle";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             let config = {
diff --git a/server/notification-providers/smsmanager.js b/server/notification-providers/smsmanager.js
index 7d55d410..d01285d8 100644
--- a/server/notification-providers/smsmanager.js
+++ b/server/notification-providers/smsmanager.js
@@ -2,23 +2,24 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class SMSManager extends NotificationProvider {
-
     name = "SMSManager";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://http-api.smsmanager.cz/Send";
+
         try {
             let data = {
                 apikey: notification.smsmanagerApiKey,
-                endpoint: "https://http-api.smsmanager.cz/Send",
                 message: msg.replace(/[^\x00-\x7F]/g, ""),
-                to: notification.numbers,
-                messageType: notification.messageType,
+                number: notification.numbers,
+                gateway: notification.messageType,
             };
-            await axios.get(`${data.endpoint}?apikey=${data.apikey}&message=${data.message}&number=${data.to}&gateway=${data.messageType}`);
-            return "SMS sent sucessfully.";
+            await axios.get(`${url}?apikey=${data.apikey}&message=${data.message}&number=${data.number}&gateway=${data.messageType}`);
+            return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
         }
diff --git a/server/notification-providers/smtp.js b/server/notification-providers/smtp.js
index 0e761bc0..b403117b 100644
--- a/server/notification-providers/smtp.js
+++ b/server/notification-providers/smtp.js
@@ -4,13 +4,13 @@ const { DOWN } = require("../../src/util");
 const { Liquid } = require("liquidjs");
 
 class SMTP extends NotificationProvider {
-
     name = "smtp";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
 
         const config = {
             host: notification.smtpHost,
@@ -76,7 +76,7 @@ class SMTP extends NotificationProvider {
             text: body,
         });
 
-        return "Sent Successfully.";
+        return okMsg;
     }
 
     /**
diff --git a/server/notification-providers/squadcast.js b/server/notification-providers/squadcast.js
index 0b60503d..1c653d14 100644
--- a/server/notification-providers/squadcast.js
+++ b/server/notification-providers/squadcast.js
@@ -3,14 +3,13 @@ const axios = require("axios");
 const { DOWN } = require("../../src/util");
 
 class Squadcast extends NotificationProvider {
-
     name = "squadcast";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
 
diff --git a/server/notification-providers/stackfield.js b/server/notification-providers/stackfield.js
index 26c038ea..65a92459 100644
--- a/server/notification-providers/stackfield.js
+++ b/server/notification-providers/stackfield.js
@@ -4,14 +4,14 @@ const { setting } = require("../util-server");
 const { getMonitorRelativeURL } = require("../../src/util");
 
 class Stackfield extends NotificationProvider {
-
     name = "stackfield";
 
     /**
      * @inheritdoc
      */
-    async send(notification, msg, monitorJSON = null) {
-        let okMsg = "Sent Successfully.";
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+
         try {
             // Stackfield message formatting: https://www.stackfield.com/help/formatting-messages-2001
 
diff --git a/server/notification-providers/teams.js b/server/notification-providers/teams.js
index bf2cd764..f34ba1ce 100644
--- a/server/notification-providers/teams.js
+++ b/server/notification-providers/teams.js
@@ -208,7 +208,7 @@ class Teams extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON == null) {
diff --git a/server/notification-providers/techulus-push.js b/server/notification-providers/techulus-push.js
index bfd9503b..230897f3 100644
--- a/server/notification-providers/techulus-push.js
+++ b/server/notification-providers/techulus-push.js
@@ -2,14 +2,13 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class TechulusPush extends NotificationProvider {
-
     name = "PushByTechulus";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             await axios.post(`https://push.techulus.com/api/v1/notify/${notification.pushAPIKey}`, {
diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js
index 896b9e08..c5bbb190 100644
--- a/server/notification-providers/telegram.js
+++ b/server/notification-providers/telegram.js
@@ -2,14 +2,14 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Telegram extends NotificationProvider {
-
     name = "telegram";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.telegram.org";
 
         try {
             let params = {
@@ -22,7 +22,7 @@ class Telegram extends NotificationProvider {
                 params.message_thread_id = notification.telegramMessageThreadID;
             }
 
-            await axios.get(`https://api.telegram.org/bot${notification.telegramBotToken}/sendMessage`, {
+            await axios.get(`${url}/bot${notification.telegramBotToken}/sendMessage`, {
                 params: params,
             });
             return okMsg;
diff --git a/server/notification-providers/twilio.js b/server/notification-providers/twilio.js
index 2abb38b9..c38a6d7e 100644
--- a/server/notification-providers/twilio.js
+++ b/server/notification-providers/twilio.js
@@ -2,26 +2,21 @@ const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 
 class Twilio extends NotificationProvider {
-
     name = "twilio";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
 
-        let okMsg = "Sent Successfully.";
-
-        let accountSID = notification.twilioAccountSID;
-        let apiKey = notification.twilioApiKey ? notification.twilioApiKey : accountSID;
-        let authToken = notification.twilioAuthToken;
+        let apiKey = notification.twilioApiKey ? notification.twilioApiKey : notification.twilioAccountSID;
 
         try {
-
             let config = {
                 headers: {
                     "Content-Type": "application/x-www-form-urlencoded;charset=utf-8",
-                    "Authorization": "Basic " + Buffer.from(apiKey + ":" + authToken).toString("base64"),
+                    "Authorization": "Basic " + Buffer.from(apiKey + ":" + notification.twilioAuthToken).toString("base64"),
                 }
             };
 
@@ -30,9 +25,7 @@ class Twilio extends NotificationProvider {
             data.append("From", notification.twilioFromNumber);
             data.append("Body", msg);
 
-            let url = "https://api.twilio.com/2010-04-01/Accounts/" + accountSID + "/Messages.json";
-
-            await axios.post(url, data, config);
+            await axios.post(`https://api.twilio.com/2010-04-01/Accounts/${(notification.twilioAccountSID)}/Messages.json`, data, config);
 
             return okMsg;
         } catch (error) {
diff --git a/server/notification-providers/webhook.js b/server/notification-providers/webhook.js
index 597ef846..986986d4 100644
--- a/server/notification-providers/webhook.js
+++ b/server/notification-providers/webhook.js
@@ -4,14 +4,13 @@ const FormData = require("form-data");
 const { Liquid } = require("liquidjs");
 
 class Webhook extends NotificationProvider {
-
     name = "webhook";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             let data = {
diff --git a/server/notification-providers/wecom.js b/server/notification-providers/wecom.js
index ea30b26d..03fa7c18 100644
--- a/server/notification-providers/wecom.js
+++ b/server/notification-providers/wecom.js
@@ -3,24 +3,22 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class WeCom extends NotificationProvider {
-
     name = "WeCom";
 
     /**
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
-            let WeComUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=" + notification.weComBotKey;
             let config = {
                 headers: {
                     "Content-Type": "application/json"
                 }
             };
             let body = this.composeMessage(heartbeatJSON, msg);
-            await axios.post(WeComUrl, body, config);
+            await axios.post(`https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${notification.weComBotKey}`, body, config);
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);
diff --git a/server/notification-providers/zoho-cliq.js b/server/notification-providers/zoho-cliq.js
index 08653e3d..10381c81 100644
--- a/server/notification-providers/zoho-cliq.js
+++ b/server/notification-providers/zoho-cliq.js
@@ -3,7 +3,6 @@ const axios = require("axios");
 const { DOWN, UP } = require("../../src/util");
 
 class ZohoCliq extends NotificationProvider {
-
     name = "ZohoCliq";
 
     /**
@@ -80,7 +79,7 @@ class ZohoCliq extends NotificationProvider {
      * @inheritdoc
      */
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        let okMsg = "Sent Successfully.";
+        const okMsg = "Sent Successfully.";
 
         try {
             if (heartbeatJSON == null) {

From 0e3b3a9ab8f991997730e03524e550bf8ff23a97 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Fri, 15 Mar 2024 15:02:55 +0100
Subject: [PATCH 41/45] Made sure that more of the async usages are awaited
 (#4574)

---
 server/auth.js                                |  4 +--
 server/database.js                            |  2 +-
 server/docker.js                              |  2 +-
 server/model/group.js                         |  4 +--
 server/model/maintenance.js                   | 18 +++++------
 server/model/monitor.js                       |  8 ++---
 server/model/status_page.js                   |  4 +--
 server/monitor-types/tailscale-ping.js        |  2 +-
 server/notification-providers/aliyun-sms.js   |  2 +-
 server/notification-providers/bark.js         |  2 +-
 server/notification-providers/dingding.js     |  6 ++--
 server/notification-providers/nostr.js        |  2 +-
 server/server.js                              | 30 +++++++++----------
 .../database-socket-handler.js                |  2 +-
 server/uptime-kuma-server.js                  |  6 ++--
 src/components/TagEditDialog.vue              |  4 +--
 src/components/TagsManager.vue                |  2 +-
 src/components/notifications/Telegram.vue     |  2 +-
 src/pages/EditMonitor.vue                     |  4 +--
 19 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/server/auth.js b/server/auth.js
index 5cf96b6f..597cf3d7 100644
--- a/server/auth.js
+++ b/server/auth.js
@@ -130,7 +130,7 @@ function userAuthorizer(username, password, callback) {
  * @param {express.Request} req Express request object
  * @param {express.Response} res Express response object
  * @param {express.NextFunction} next Next handler in chain
- * @returns {void}
+ * @returns {Promise<void>}
  */
 exports.basicAuth = async function (req, res, next) {
     const middleware = basicAuth({
@@ -153,7 +153,7 @@ exports.basicAuth = async function (req, res, next) {
  * @param {express.Request} req Express request object
  * @param {express.Response} res Express response object
  * @param {express.NextFunction} next Next handler in chain
- * @returns {void}
+ * @returns {Promise<void>}
  */
 exports.apiAuth = async function (req, res, next) {
     if (!await Settings.get("disableAuth")) {
diff --git a/server/database.js b/server/database.js
index 4a12746f..cfe14fe7 100644
--- a/server/database.js
+++ b/server/database.js
@@ -378,7 +378,7 @@ class Database {
 
     /**
      * Patch the database
-     * @returns {void}
+     * @returns {Promise<void>}
      */
     static async patch() {
         // Still need to keep this for old versions of Uptime Kuma
diff --git a/server/docker.js b/server/docker.js
index bec0e0b1..ee6051df 100644
--- a/server/docker.js
+++ b/server/docker.js
@@ -65,7 +65,7 @@ class DockerHost {
     /**
      * Fetches the amount of containers on the Docker host
      * @param {object} dockerHost Docker host to check for
-     * @returns {number} Total amount of containers on the host
+     * @returns {Promise<number>} Total amount of containers on the host
      */
     static async testDockerHost(dockerHost) {
         const options = {
diff --git a/server/model/group.js b/server/model/group.js
index 98ac2a47..bd2c3018 100644
--- a/server/model/group.js
+++ b/server/model/group.js
@@ -9,7 +9,7 @@ class Group extends BeanModel {
      * @param {boolean} showTags Should the JSON include monitor tags
      * @param {boolean} certExpiry Should JSON include info about
      * certificate expiry?
-     * @returns {object} Object ready to parse
+     * @returns {Promise<object>} Object ready to parse
      */
     async toPublicJSON(showTags = false, certExpiry = false) {
         let monitorBeanList = await this.getMonitorList();
@@ -29,7 +29,7 @@ class Group extends BeanModel {
 
     /**
      * Get all monitors
-     * @returns {Bean[]} List of monitors
+     * @returns {Promise<Bean[]>} List of monitors
      */
     async getMonitorList() {
         return R.convertToBeans("monitor", await R.getAll(`
diff --git a/server/model/maintenance.js b/server/model/maintenance.js
index fb51060e..516c0377 100644
--- a/server/model/maintenance.js
+++ b/server/model/maintenance.js
@@ -11,7 +11,7 @@ class Maintenance extends BeanModel {
     /**
      * Return an object that ready to parse to JSON for public
      * Only show necessary data to public
-     * @returns {object} Object ready to parse
+     * @returns {Promise<object>} Object ready to parse
      */
     async toPublicJSON() {
 
@@ -98,7 +98,7 @@ class Maintenance extends BeanModel {
     /**
      * Return an object that ready to parse to JSON
      * @param {string} timezone If not specified, the timeRange will be in UTC
-     * @returns {object} Object ready to parse
+     * @returns {Promise<object>} Object ready to parse
      */
     async toJSON(timezone = null) {
         return this.toPublicJSON(timezone);
@@ -143,7 +143,7 @@ class Maintenance extends BeanModel {
      * Convert data from socket to bean
      * @param {Bean} bean Bean to fill in
      * @param {object} obj Data to fill bean with
-     * @returns {Bean} Filled bean
+     * @returns {Promise<Bean>} Filled bean
      */
     static async jsonToBean(bean, obj) {
         if (obj.id) {
@@ -189,9 +189,9 @@ class Maintenance extends BeanModel {
     /**
      * Throw error if cron is invalid
      * @param {string|Date} cron Pattern or date
-     * @returns {Promise<void>}
+     * @returns {void}
      */
-    static async validateCron(cron) {
+    static validateCron(cron) {
         let job = new Cron(cron, () => {});
         job.stop();
     }
@@ -324,7 +324,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Is this maintenance currently active
-     * @returns {boolean} The maintenance is active?
+     * @returns {Promise<boolean>} The maintenance is active?
      */
     async isUnderMaintenance() {
         return (await this.getStatus()) === "under-maintenance";
@@ -332,7 +332,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Get the timezone of the maintenance
-     * @returns {string} timezone
+     * @returns {Promise<string>} timezone
      */
     async getTimezone() {
         if (!this.timezone || this.timezone === "SAME_AS_SERVER") {
@@ -343,7 +343,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Get offset for timezone
-     * @returns {string} offset
+     * @returns {Promise<string>} offset
      */
     async getTimezoneOffset() {
         return dayjs.tz(dayjs(), await this.getTimezone()).format("Z");
@@ -351,7 +351,7 @@ class Maintenance extends BeanModel {
 
     /**
      * Get the current status of the maintenance
-     * @returns {string} Current status
+     * @returns {Promise<string>} Current status
      */
     async getStatus() {
         if (!this.active) {
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 50367073..1667b83a 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -43,7 +43,7 @@ class Monitor extends BeanModel {
      * @param {boolean} showTags Include tags in JSON
      * @param {boolean} certExpiry Include certificate expiry info in
      * JSON
-     * @returns {object} Object ready to parse
+     * @returns {Promise<object>} Object ready to parse
      */
     async toPublicJSON(showTags = false, certExpiry = false) {
         let obj = {
@@ -74,7 +74,7 @@ class Monitor extends BeanModel {
      * Return an object that ready to parse to JSON
      * @param {boolean} includeSensitiveData Include sensitive data in
      * JSON
-     * @returns {object} Object ready to parse
+     * @returns {Promise<object>} Object ready to parse
      */
     async toJSON(includeSensitiveData = true) {
 
@@ -947,7 +947,7 @@ class Monitor extends BeanModel {
                 log.debug("monitor", `[${this.name}] apicache clear`);
                 apicache.clear();
 
-                UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id);
+                await UptimeKumaServer.getInstance().sendMaintenanceListByUserID(this.user_id);
 
             } else {
                 bean.important = false;
@@ -1377,7 +1377,7 @@ class Monitor extends BeanModel {
             let notifyDays = await setting("tlsExpiryNotifyDays");
             if (notifyDays == null || !Array.isArray(notifyDays)) {
                 // Reset Default
-                setSetting("tlsExpiryNotifyDays", [ 7, 14, 21 ], "general");
+                await setSetting("tlsExpiryNotifyDays", [ 7, 14, 21 ], "general");
                 notifyDays = [ 7, 14, 21 ];
             }
 
diff --git a/server/model/status_page.js b/server/model/status_page.js
index 06fa7a68..23558298 100644
--- a/server/model/status_page.js
+++ b/server/model/status_page.js
@@ -18,7 +18,7 @@ class StatusPage extends BeanModel {
      * @param {Response} response Response object
      * @param {string} indexHTML HTML to render
      * @param {string} slug Status page slug
-     * @returns {void}
+     * @returns {Promise<void>}
      */
     static async handleStatusPageResponse(response, indexHTML, slug) {
         // Handle url with trailing slash (http://localhost:3001/status/)
@@ -42,7 +42,7 @@ class StatusPage extends BeanModel {
      * SSR for status pages
      * @param {string} indexHTML HTML page to render
      * @param {StatusPage} statusPage Status page populate HTML with
-     * @returns {void}
+     * @returns {Promise<string>} the rendered html
      */
     static async renderHTML(indexHTML, statusPage) {
         const $ = cheerio.load(indexHTML);
diff --git a/server/monitor-types/tailscale-ping.js b/server/monitor-types/tailscale-ping.js
index 0a39544e..5950cc21 100644
--- a/server/monitor-types/tailscale-ping.js
+++ b/server/monitor-types/tailscale-ping.js
@@ -16,7 +16,7 @@ class TailscalePing extends MonitorType {
      * @param {object} monitor The monitor object associated with the check.
      * @param {object} heartbeat The heartbeat object to update.
      * @returns {Promise<void>}
-     * @throws Will throw an error if checking Tailscale ping encounters any error
+     * @throws Error if checking Tailscale ping encounters any error
      */
     async check(monitor, heartbeat) {
         try {
diff --git a/server/notification-providers/aliyun-sms.js b/server/notification-providers/aliyun-sms.js
index b895f70a..ff38bd0d 100644
--- a/server/notification-providers/aliyun-sms.js
+++ b/server/notification-providers/aliyun-sms.js
@@ -44,7 +44,7 @@ class AliyunSMS extends NotificationProvider {
      * Send the SMS notification
      * @param {BeanModel} notification Notification details
      * @param {string} msgbody Message template
-     * @returns {boolean} True if successful else false
+     * @returns {Promise<boolean>} True if successful else false
      */
     async sendSms(notification, msgbody) {
         let params = {
diff --git a/server/notification-providers/bark.js b/server/notification-providers/bark.js
index 4d6c0ae0..0907d5f1 100644
--- a/server/notification-providers/bark.js
+++ b/server/notification-providers/bark.js
@@ -92,7 +92,7 @@ class Bark extends NotificationProvider {
      * @param {string} title Message title
      * @param {string} subtitle Message
      * @param {string} endpoint Endpoint to send request to
-     * @returns {string} Success message
+     * @returns {Promise<string>} Success message
      */
     async postNotification(notification, title, subtitle, endpoint) {
         let result;
diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index 3aa81922..5e7f030b 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -21,7 +21,7 @@ class DingDing extends NotificationProvider {
                         text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}`,
                     }
                 };
-                if (this.sendToDingDing(notification, params)) {
+                if (await this.sendToDingDing(notification, params)) {
                     return okMsg;
                 }
             } else {
@@ -31,7 +31,7 @@ class DingDing extends NotificationProvider {
                         content: msg
                     }
                 };
-                if (this.sendToDingDing(notification, params)) {
+                if (await this.sendToDingDing(notification, params)) {
                     return okMsg;
                 }
             }
@@ -44,7 +44,7 @@ class DingDing extends NotificationProvider {
      * Send message to DingDing
      * @param {BeanModel} notification Notification to send
      * @param {object} params Parameters of message
-     * @returns {boolean} True if successful else false
+     * @returns {Promise<boolean>} True if successful else false
      */
     async sendToDingDing(notification, params) {
         let timestamp = Date.now();
diff --git a/server/notification-providers/nostr.js b/server/notification-providers/nostr.js
index 9d93678f..453b86d0 100644
--- a/server/notification-providers/nostr.js
+++ b/server/notification-providers/nostr.js
@@ -107,7 +107,7 @@ class Nostr extends NotificationProvider {
     /**
      * Get public keys for recipients
      * @param {string} recipients Newline delimited list of recipients
-     * @returns {nip19.DecodeResult[]} Public keys
+     * @returns {Promise<nip19.DecodeResult[]>} Public keys
      */
     async getPublicKeys(recipients) {
         const recipientsList = recipients.split("\n");
diff --git a/server/server.js b/server/server.js
index b950dc0d..45732471 100644
--- a/server/server.js
+++ b/server/server.js
@@ -294,7 +294,7 @@ let needSetup = false;
     log.debug("server", "Adding socket handler");
     io.on("connection", async (socket) => {
 
-        sendInfo(socket, true);
+        await sendInfo(socket, true);
 
         if (needSetup) {
             log.info("server", "Redirect to setup page");
@@ -326,7 +326,7 @@ let needSetup = false;
                     }
 
                     log.debug("auth", "afterLogin");
-                    afterLogin(socket, user);
+                    await afterLogin(socket, user);
                     log.debug("auth", "afterLogin ok");
 
                     log.info("auth", `Successfully logged in user ${decoded.username}. IP=${clientIP}`);
@@ -382,7 +382,7 @@ let needSetup = false;
 
             if (user) {
                 if (user.twofa_status === 0) {
-                    afterLogin(socket, user);
+                    await afterLogin(socket, user);
 
                     log.info("auth", `Successfully logged in user ${data.username}. IP=${clientIP}`);
 
@@ -405,7 +405,7 @@ let needSetup = false;
                     let verify = notp.totp.verify(data.token, user.twofa_secret, twoFAVerifyOptions);
 
                     if (user.twofa_last_token !== data.token && verify) {
-                        afterLogin(socket, user);
+                        await afterLogin(socket, user);
 
                         await R.exec("UPDATE `user` SET twofa_last_token = ? WHERE id = ? ", [
                             data.token,
@@ -1351,8 +1351,8 @@ let needSetup = false;
                     msgi18n: true,
                 });
 
-                sendInfo(socket);
-                server.sendMaintenanceList(socket);
+                await sendInfo(socket);
+                await server.sendMaintenanceList(socket);
 
             } catch (e) {
                 callback({
@@ -1532,7 +1532,7 @@ let needSetup = false;
         log.debug("auth", "check auto login");
         if (await setting("disableAuth")) {
             log.info("auth", "Disabled Auth: auto login to admin");
-            afterLogin(socket, await R.findOne("user"));
+            await afterLogin(socket, await R.findOne("user"));
             socket.emit("autoLogin");
         } else {
             log.debug("auth", "need auth");
@@ -1548,7 +1548,7 @@ let needSetup = false;
         process.exit(1);
     });
 
-    server.start();
+    await server.start();
 
     server.httpServer.listen(port, hostname, () => {
         if (hostname) {
@@ -1619,13 +1619,13 @@ async function afterLogin(socket, user) {
     socket.join(user.id);
 
     let monitorList = await server.sendMonitorList(socket);
-    sendInfo(socket);
-    server.sendMaintenanceList(socket);
-    sendNotificationList(socket);
-    sendProxyList(socket);
-    sendDockerHostList(socket);
-    sendAPIKeyList(socket);
-    sendRemoteBrowserList(socket);
+    await sendInfo(socket);
+    await server.sendMaintenanceList(socket);
+    await sendNotificationList(socket);
+    await sendProxyList(socket);
+    await sendDockerHostList(socket);
+    await sendAPIKeyList(socket);
+    await sendRemoteBrowserList(socket);
 
     await sleep(500);
 
diff --git a/server/socket-handlers/database-socket-handler.js b/server/socket-handlers/database-socket-handler.js
index 8441520a..bcf34c90 100644
--- a/server/socket-handlers/database-socket-handler.js
+++ b/server/socket-handlers/database-socket-handler.js
@@ -27,7 +27,7 @@ module.exports = (socket) => {
     socket.on("shrinkDatabase", async (callback) => {
         try {
             checkLogin(socket);
-            Database.shrink();
+            await Database.shrink();
             callback({
                 ok: true,
             });
diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 2eec9c7c..bcf497b5 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -195,7 +195,7 @@ class UptimeKumaServer {
     /**
      * Send list of monitors to client
      * @param {Socket} socket Socket to send list on
-     * @returns {object} List of monitors
+     * @returns {Promise<object>} List of monitors
      */
     async sendMonitorList(socket) {
         let list = await this.getMonitorJSONList(socket.userID);
@@ -227,7 +227,7 @@ class UptimeKumaServer {
     /**
      * Send maintenance list to client
      * @param {Socket} socket Socket.io instance to send to
-     * @returns {object} Maintenance list
+     * @returns {Promise<object>} Maintenance list
      */
     async sendMaintenanceList(socket) {
         return await this.sendMaintenanceListByUserID(socket.userID);
@@ -236,7 +236,7 @@ class UptimeKumaServer {
     /**
      * Send list of maintenances to user
      * @param {number} userID User to send list to
-     * @returns {object} Maintenance list
+     * @returns {Promise<object>} Maintenance list
      */
     async sendMaintenanceListByUserID(userID) {
         let list = await this.getMaintenanceJSONList(userID);
diff --git a/src/components/TagEditDialog.vue b/src/components/TagEditDialog.vue
index b77967c7..77fce260 100644
--- a/src/components/TagEditDialog.vue
+++ b/src/components/TagEditDialog.vue
@@ -288,7 +288,7 @@ export default {
 
         /**
          * Submit tag and monitorTag changes to server
-         * @returns {void}
+         * @returns {Promise<void>}
          */
         async submit() {
             this.processing = true;
@@ -348,7 +348,7 @@ export default {
 
         /**
          * Delete the editing tag from server
-         * @returns {void}
+         * @returns {Promise<void>}
          */
         async deleteTag() {
             this.processing = true;
diff --git a/src/components/TagsManager.vue b/src/components/TagsManager.vue
index 37e0ca4e..6b77b1c3 100644
--- a/src/components/TagsManager.vue
+++ b/src/components/TagsManager.vue
@@ -384,7 +384,7 @@ export default {
         /**
          * Submit the form data
          * @param {number} monitorId ID of monitor this change affects
-         * @returns {void}
+         * @returns {Promise<void>}
          */
         async submit(monitorId) {
             console.log(`Submitting tag changes for monitor ${monitorId}...`);
diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue
index 40473e93..a072c3ed 100644
--- a/src/components/notifications/Telegram.vue
+++ b/src/components/notifications/Telegram.vue
@@ -85,7 +85,7 @@ export default {
 
         /**
          * Get the telegram chat ID
-         * @returns {void}
+         * @returns {Promise<void>}
          * @throws The chat ID could not be found
          */
         async autoGetTelegramChatID() {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 72cb181e..e9f3ac83 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -1470,7 +1470,7 @@ message HealthCheckResponse {
 
         /**
          * Submit the form data for processing
-         * @returns {void}
+         * @returns {Promise<void>}
          */
         async submit() {
 
@@ -1535,7 +1535,7 @@ message HealthCheckResponse {
 
                         // Start the new parent monitor after edit is done
                         if (createdNewParent) {
-                            this.startParentGroupMonitor();
+                            await this.startParentGroupMonitor();
                         }
                         this.processing = false;
                         this.$root.getMonitorList();

From 975761b4489ff8a6aac08efe5ae922e8cc156dae Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Mon, 18 Mar 2024 17:16:04 +0100
Subject: [PATCH 42/45] made sure to use `Promise.allSettled` instead of
 sleeping for 500ms after login (#4592)

---
 server/server.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/server.js b/server/server.js
index 45732471..753f88b8 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1619,15 +1619,15 @@ async function afterLogin(socket, user) {
     socket.join(user.id);
 
     let monitorList = await server.sendMonitorList(socket);
-    await sendInfo(socket);
-    await server.sendMaintenanceList(socket);
-    await sendNotificationList(socket);
-    await sendProxyList(socket);
-    await sendDockerHostList(socket);
-    await sendAPIKeyList(socket);
-    await sendRemoteBrowserList(socket);
-
-    await sleep(500);
+    await Promise.allSettled([
+        sendInfo(socket),
+        server.sendMaintenanceList(socket),
+        sendNotificationList(socket),
+        sendProxyList(socket),
+        sendDockerHostList(socket),
+        sendAPIKeyList(socket),
+        sendRemoteBrowserList(socket),
+    ]);
 
     await StatusPage.sendStatusPageList(io, socket);
 

From bc077cc536ee95b904f9a4a730b1fcedcf1788dd Mon Sep 17 00:00:00 2001
From: OptimusGREEN <OptimusGREEN@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:31:37 +0000
Subject: [PATCH 43/45] add notification channel for home assistant (#4541)

Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Seb <144435+rmtsrc@users.noreply.github.com>
---
 server/notification-providers/home-assistant.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/notification-providers/home-assistant.js b/server/notification-providers/home-assistant.js
index ee95ba0b..4536b2a4 100644
--- a/server/notification-providers/home-assistant.js
+++ b/server/notification-providers/home-assistant.js
@@ -23,6 +23,8 @@ class HomeAssistant extends NotificationProvider {
                     ...(notificationService !== "persistent_notification" && { data: {
                         name: monitorJSON?.name,
                         status: heartbeatJSON?.status,
+                        channel: "Uptime Kuma",
+                        icon_url: "https://github.com/louislam/uptime-kuma/blob/master/public/icon.png?raw=true",
                     } }),
                 },
                 {

From 5bc68fe0a77bbae671e717b22808828e3c217201 Mon Sep 17 00:00:00 2001
From: Elliot Matson <1711604+elliotmatson@users.noreply.github.com>
Date: Wed, 20 Mar 2024 04:58:28 -0700
Subject: [PATCH 44/45] Google chat cards (#3928)

Co-authored-by: Frank Elsinga <frank@elsinga.de>
---
 server/notification-providers/google-chat.js | 74 ++++++++++++++++----
 1 file changed, 59 insertions(+), 15 deletions(-)

diff --git a/server/notification-providers/google-chat.js b/server/notification-providers/google-chat.js
index 9f1b53b7..0b72fea9 100644
--- a/server/notification-providers/google-chat.js
+++ b/server/notification-providers/google-chat.js
@@ -1,8 +1,7 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
 const { setting } = require("../util-server");
-const { getMonitorRelativeURL } = require("../../src/util");
-const { DOWN, UP } = require("../../src/util");
+const { getMonitorRelativeURL, UP } = require("../../src/util");
 
 class GoogleChat extends NotificationProvider {
     name = "GoogleChat";
@@ -16,26 +15,71 @@ class GoogleChat extends NotificationProvider {
         try {
             // Google Chat message formatting: https://developers.google.com/chat/api/guides/message-formats/basic
 
-            let textMsg = "";
-            if (heartbeatJSON && heartbeatJSON.status === UP) {
-                textMsg = "✅ Application is back online\n";
-            } else if (heartbeatJSON && heartbeatJSON.status === DOWN) {
-                textMsg = "🔴 Application went down\n";
-            }
+            let chatHeader = {
+                title: "Uptime Kuma Alert",
+            };
 
-            if (monitorJSON && monitorJSON.name) {
-                textMsg += `*${monitorJSON.name}*\n`;
+            if (monitorJSON && heartbeatJSON) {
+                chatHeader["title"] =
+                    heartbeatJSON["status"] === UP
+                        ? `✅ ${monitorJSON["name"]} is back online`
+                        : `🔴 ${monitorJSON["name"]} went down`;
             }
 
-            textMsg += `${msg}`;
+            // always show msg
+            let sectionWidgets = [
+                {
+                    textParagraph: {
+                        text: `<b>Message:</b>\n${msg}`,
+                    },
+                },
+            ];
 
+            // add time if available
+            if (heartbeatJSON) {
+                sectionWidgets.push({
+                    textParagraph: {
+                        text: `<b>Time (${heartbeatJSON["timezone"]}):</b>\n${heartbeatJSON["localDateTime"]}`,
+                    },
+                });
+            }
+
+            // add button for monitor link if available
             const baseURL = await setting("primaryBaseURL");
-            if (baseURL && monitorJSON) {
-                textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
+            if (baseURL) {
+                const urlPath = monitorJSON ? getMonitorRelativeURL(monitorJSON.id) : "/";
+                sectionWidgets.push({
+                    buttonList: {
+                        buttons: [
+                            {
+                                text: "Visit Uptime Kuma",
+                                onClick: {
+                                    openLink: {
+                                        url: baseURL + urlPath,
+                                    },
+                                },
+                            },
+                        ],
+                    },
+                });
             }
 
-            const data = {
-                "text": textMsg,
+            let chatSections = [
+                {
+                    widgets: sectionWidgets,
+                },
+            ];
+
+            // construct json data
+            let data = {
+                cardsV2: [
+                    {
+                        card: {
+                            header: chatHeader,
+                            sections: chatSections,
+                        },
+                    },
+                ],
             };
 
             await axios.post(notification.googleChatWebhookURL, data);

From 45690a25a0c4dffb9555670af8b5dcdc6bd2856b Mon Sep 17 00:00:00 2001
From: DevMirza <53424436+Zaid-maker@users.noreply.github.com>
Date: Wed, 20 Mar 2024 07:20:40 -0700
Subject: [PATCH 45/45] fix(ci): Fix for the Actions failing on Windows Runner
 (#4557)

---
 .github/workflows/auto-test.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
index b3a7daca..d0629f7b 100644
--- a/.github/workflows/auto-test.yml
+++ b/.github/workflows/auto-test.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest, ARM64]
-        node: [ 14, 20.5 ]
+        node: [ 16, 20.5 ]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -33,10 +33,13 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node }}
-    - run: npm install npm@9 -g
-    - run: npm install
-    - run: npm run build
-    - run: npm run test-backend
+  
+    - name: Install
+      run: npm install
+    - name: Build
+      run: npm run build
+    - name: Test Backend
+      run: npm run test-backend
       env:
         HEADLESS_TEST: 1
         JUST_FOR_TEST: ${{ secrets.JUST_FOR_TEST }}
@@ -61,7 +64,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      - run: npm install npm@9 -g
       - run: npm ci --production
 
   check-linters: