Merge 216f39d556 into 03beef8006

Co-authored-by: Frank Elsinga <frank@elsinga.de>

.dockerignore

@@ -32,7 +32,6 @@ tsconfig.json
 /extra/healthcheck.exe
 /extra/healthcheck
 /extra/exe-builder
-/extra/push-examples
 /extra/uptime-kuma-push
 
 # Comment the following line if you want to rebuild the healthcheck binary

server/modules/apicache/apicache.js

@@ -485,7 +485,7 @@ function ApiCache() {
         }
 
         if (typeof duration === "string") {
-            let split = duration.match(/^([\d\.,]+)\s?(\w+)$/);
+            let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/);
 
             if (split.length === 3) {
                 let len = parseFloat(split[1]);

server/notification-providers/alerta.js

@@ -44,7 +44,7 @@ class Alerta extends NotificationProvider {
                     correlate: [ "service_up", "service_down" ],
                     event: monitorJSON["type"],
                     group: "uptimekuma-" + monitorJSON["type"],
-                    resource: monitorJSON["name"],
+                    resource: monitorJSON["pathName"],
                 }, data );
 
                 if (heartbeatJSON["status"] === DOWN) {

server/notification-providers/bale.js

@@ -1,34 +0,0 @@
-const NotificationProvider = require("./notification-provider");
-const axios = require("axios");
-
-class Bale extends NotificationProvider {
-    name = "bale";
-
-    /**
-     * @inheritdoc
-     */
-    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        const okMsg = "Sent Successfully.";
-        const url = "https://tapi.bale.ai";
-
-        try {
-            await axios.post(
-                `${url}/bot${notification.baleBotToken}/sendMessage`,
-                {
-                    chat_id: notification.baleChatID,
-                    text: msg
-                },
-                {
-                    headers: {
-                        "content-type": "application/json",
-                    },
-                }
-            );
-            return okMsg;
-        } catch (error) {
-            this.throwGeneralAxiosError(error);
-        }
-    }
-}
-
-module.exports = Bale;

server/notification-providers/mattermost.js

@@ -70,7 +70,7 @@ class Mattermost extends NotificationProvider {
             }
 
             let mattermostdata = {
-                username: monitorJSON.name + " " + mattermostUserName,
+                username: monitorJSON.pathName + " " + mattermostUserName,
                 channel: mattermostChannel,
                 icon_emoji: iconEmoji,
                 icon_url: mattermostIconUrl,

server/notification-providers/ntfy.js

@@ -60,7 +60,7 @@ class Ntfy extends NotificationProvider {
                 data.actions = [
                     {
                         "action": "view",
-                        "label": "Open " + monitorJSON.name,
+                        "label": "Open " + monitorJSON.pathName,
                         "url": monitorJSON.url,
                     },
                 ];

server/notification-providers/opsgenie.js

@@ -44,7 +44,7 @@ class Opsgenie extends NotificationProvider {
             if (heartbeatJSON.status === DOWN) {
                 let data = {
                     "message": monitorJSON ? textMsg + `: ${monitorJSON.pathName}` : textMsg,
-                    "alias": monitorJSON.name,
+                    "alias": monitorJSON.pathName,
                     "description": msg,
                     "source": "Uptime Kuma",
                     "priority": `P${priority}`
@@ -54,7 +54,7 @@ class Opsgenie extends NotificationProvider {
             }
 
             if (heartbeatJSON.status === UP) {
-                let opsgenieAlertsCloseUrl = `${opsgenieAlertsUrl}/${encodeURIComponent(monitorJSON.name)}/close?identifierType=alias`;
+                let opsgenieAlertsCloseUrl = `${opsgenieAlertsUrl}/${encodeURIComponent(monitorJSON.pathName)}/close?identifierType=alias`;
                 let data = {
                     "source": "Uptime Kuma",
                 };

server/notification-providers/teams.js

@@ -224,7 +224,7 @@ class Teams extends NotificationProvider {
 
             const payload = this._notificationPayloadFactory({
                 heartbeatJSON: heartbeatJSON,
-                monitorName: monitorJSON.name,
+                monitorName: monitorJSON.pathName,
                 monitorUrl: this.extractAddress(monitorJSON),
                 dashboardUrl: dashboardUrl,
             });

server/notification-providers/zoho-cliq.js

@@ -84,7 +84,7 @@ class ZohoCliq extends NotificationProvider {
 
             const payload = this._notificationPayloadFactory({
                 monitorMessage: heartbeatJSON.msg,
-                monitorName: monitorJSON.name,
+                monitorName: monitorJSON.pathName,
                 monitorUrl: this.extractAddress(monitorJSON),
                 status: heartbeatJSON.status
             });

server/notification.js

@@ -4,7 +4,6 @@ const Alerta = require("./notification-providers/alerta");
 const AlertNow = require("./notification-providers/alertnow");
 const AliyunSms = require("./notification-providers/aliyun-sms");
 const Apprise = require("./notification-providers/apprise");
-const Bale = require("./notification-providers/bale");
 const Bark = require("./notification-providers/bark");
 const Bitrix24 = require("./notification-providers/bitrix24");
 const ClickSendSMS = require("./notification-providers/clicksendsms");
@@ -72,6 +71,7 @@ const Wpush = require("./notification-providers/wpush");
 const SendGrid = require("./notification-providers/send-grid");
 
 class Notification {
+
     providerList = {};
 
     /**
@@ -90,7 +90,6 @@ class Notification {
             new AlertNow(),
             new AliyunSms(),
             new Apprise(),
-            new Bale(),
             new Bark(),
             new Bitrix24(),
             new ClickSendSMS(),
@@ -155,10 +154,10 @@ class Notification {
             new GtxMessaging(),
             new Cellsynt(),
             new Wpush(),
-            new SendGrid(),
+            new SendGrid()
         ];
         for (let item of list) {
-            if (!item.name) {
+            if (! item.name) {
                 throw new Error("Notification provider without name");
             }
 
@@ -178,19 +177,9 @@ class Notification {
      * @returns {Promise<string>} Successful msg
      * @throws Error with fail msg
      */
-    static async send(
+    static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
-        notification,
-        msg,
-        monitorJSON = null,
-        heartbeatJSON = null
-    ) {
         if (this.providerList[notification.type]) {
-            return this.providerList[notification.type].send(
+            return this.providerList[notification.type].send(notification, msg, monitorJSON, heartbeatJSON);
-                notification,
-                msg,
-                monitorJSON,
-                heartbeatJSON
-            );
         } else {
             throw new Error("Notification type is not supported");
         }
@@ -212,9 +201,10 @@ class Notification {
                 userID,
             ]);
 
-            if (!bean) {
+            if (! bean) {
                 throw new Error("notification not found");
             }
+
         } else {
             bean = R.dispense("notification");
         }
@@ -244,7 +234,7 @@ class Notification {
             userID,
         ]);
 
-        if (!bean) {
+        if (! bean) {
             throw new Error("notification not found");
         }
 
@@ -260,6 +250,7 @@ class Notification {
         let exists = commandExistsSync("apprise");
         return exists;
     }
+
 }
 
 /**
@@ -270,17 +261,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(
+        let checkNotification = await R.findOne("monitor_notification", " monitor_id = ? AND notification_id = ? ", [
-            "monitor_notification",
+            monitors[i].id,
-            " monitor_id = ? AND notification_id = ? ",
+            notificationID,
-            [ monitors[i].id, notificationID ]
+        ]);
-        );
 
-        if (!checkNotification) {
+        if (! checkNotification) {
             let relation = R.dispense("monitor_notification");
             relation.monitor_id = monitors[i].id;
             relation.notification_id = notificationID;

src/components/NotificationDialog.vue

@@ -113,7 +113,6 @@ export default {
                 "alerta": "Alerta",
                 "AlertNow": "AlertNow",
                 "apprise": this.$t("apprise"),
-                "bale": "Bale",
                 "Bark": "Bark",
                 "Bitrix24": "Bitrix24",
                 "clicksendsms": "ClickSend SMS",

src/components/notifications/Bale.vue

@@ -1,93 +0,0 @@
-<template>
-    <div class="mb-3">
-        <label for="bale-bot-token" class="form-label">{{ $t("Bot Token") }}</label>
-        <HiddenInput id="bale-bot-token" v-model="$parent.notification.baleBotToken" :required="true" autocomplete="new-password"></HiddenInput>
-        <i18n-t tag="div" keypath="wayToGetBaleToken" class="form-text">
-            <a href="https://ble.ir/BotFather" target="_blank">https://ble.ir/BotFather</a>
-        </i18n-t>
-    </div>
-
-    <div class="mb-3">
-        <label for="bale-chat-id" class="form-label">{{ $t("Chat ID") }}</label>
-
-        <div class="input-group mb-3">
-            <input id="bale-chat-id" v-model="$parent.notification.baleChatID" type="text" class="form-control" required>
-            <button v-if="$parent.notification.baleBotToken" class="btn btn-outline-secondary" type="button" @click="autoGetBaleChatID">
-                {{ $t("Auto Get") }}
-            </button>
-        </div>
-
-        <div class="form-text">
-            {{ $t("supportBaleChatID") }}
-
-            <p style="margin-top: 8px;">
-                {{ $t("wayToGetBaleChatID") }}
-            </p>
-
-            <p style="margin-top: 8px;">
-                <a :href="baleGetUpdatesURL('withToken')" target="_blank" style="word-break: break-word;">{{ baleGetUpdatesURL("masked") }}</a>
-            </p>
-        </div>
-    </div>
-</template>
-
-<script>
-import HiddenInput from "../HiddenInput.vue";
-import axios from "axios";
-
-export default {
-    components: {
-        HiddenInput,
-    },
-    methods: {
-        /**
-         * Get the URL for bale updates
-         * @param {string} mode Should the token be masked?
-         * @returns {string} formatted URL
-         */
-        baleGetUpdatesURL(mode = "masked") {
-            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`;
-
-            if (this.$parent.notification.baleBotToken) {
-                if (mode === "withToken") {
-                    token = this.$parent.notification.baleBotToken;
-                } else if (mode === "masked") {
-                    token = "*".repeat(this.$parent.notification.baleBotToken.length);
-                }
-            }
-
-            return `https://tapi.bale.ai/bot${token}/getUpdates`;
-        },
-
-        /**
-         * Get the bale chat ID
-         * @returns {Promise<void>}
-         * @throws The chat ID could not be found
-         */
-        async autoGetBaleChatID() {
-            try {
-                let res = await axios.get(this.baleGetUpdatesURL("withToken"));
-
-                if (res.data.result.length >= 1) {
-                    let update = res.data.result[res.data.result.length - 1];
-
-                    if (update.channel_post) {
-                        this.$parent.notification.baleChatID = update.channel_post.chat.id;
-                    } else if (update.message) {
-                        this.$parent.notification.baleChatID = update.message.chat.id;
-                    } else {
-                        throw new Error(this.$t("chatIDNotFound"));
-                    }
-
-                } else {
-                    throw new Error(this.$t("chatIDNotFound"));
-                }
-
-            } catch (error) {
-                this.$root.toastError(error.message);
-            }
-
-        },
-    }
-};
-</script>

src/components/notifications/index.js

@@ -2,7 +2,6 @@ import Alerta from "./Alerta.vue";
 import AlertNow from "./AlertNow.vue";
 import AliyunSMS from "./AliyunSms.vue";
 import Apprise from "./Apprise.vue";
-import Bale from "./Bale.vue";
 import Bark from "./Bark.vue";
 import Bitrix24 from "./Bitrix24.vue";
 import ClickSendSMS from "./ClickSendSMS.vue";
@@ -74,76 +73,75 @@ import SendGrid from "./SendGrid.vue";
  * @type { Record<string, any> }
  */
 const NotificationFormList = {
-    alerta: Alerta,
+    "alerta": Alerta,
-    AlertNow: AlertNow,
+    "AlertNow": AlertNow,
-    AliyunSMS: AliyunSMS,
+    "AliyunSMS": AliyunSMS,
-    apprise: Apprise,
+    "apprise": Apprise,
-    bale: Bale,
+    "Bark": Bark,
-    Bark: Bark,
+    "Bitrix24": Bitrix24,
-    Bitrix24: Bitrix24,
+    "clicksendsms": ClickSendSMS,
-    clicksendsms: ClickSendSMS,
+    "CallMeBot": CallMeBot,
-    CallMeBot: CallMeBot,
+    "smsc": SMSC,
-    smsc: SMSC,
+    "DingDing": DingDing,
-    DingDing: DingDing,
+    "discord": Discord,
-    discord: Discord,
+    "Elks": Elks,
-    Elks: Elks,
+    "Feishu": Feishu,
-    Feishu: Feishu,
+    "FreeMobile": FreeMobile,
-    FreeMobile: FreeMobile,
+    "GoogleChat": GoogleChat,
-    GoogleChat: GoogleChat,
+    "gorush": Gorush,
-    gorush: Gorush,
+    "gotify": Gotify,
-    gotify: Gotify,
+    "GrafanaOncall": GrafanaOncall,
-    GrafanaOncall: GrafanaOncall,
+    "HomeAssistant": HomeAssistant,
-    HomeAssistant: HomeAssistant,
+    "HeiiOnCall": HeiiOnCall,
-    HeiiOnCall: HeiiOnCall,
+    "Keep": Keep,
-    Keep: Keep,
+    "Kook": Kook,
-    Kook: Kook,
+    "line": Line,
-    line: Line,
+    "LineNotify": LineNotify,
-    LineNotify: LineNotify,
+    "lunasea": LunaSea,
-    lunasea: LunaSea,
+    "matrix": Matrix,
-    matrix: Matrix,
+    "mattermost": Mattermost,
-    mattermost: Mattermost,
+    "nostr": Nostr,
-    nostr: Nostr,
+    "ntfy": Ntfy,
-    ntfy: Ntfy,
+    "octopush": Octopush,
-    octopush: Octopush,
+    "OneBot": OneBot,
-    OneBot: OneBot,
+    "Onesender": Onesender,
-    Onesender: Onesender,
+    "Opsgenie": Opsgenie,
-    Opsgenie: Opsgenie,
+    "PagerDuty": PagerDuty,
-    PagerDuty: PagerDuty,
+    "FlashDuty": FlashDuty,
-    FlashDuty: FlashDuty,
+    "PagerTree": PagerTree,
-    PagerTree: PagerTree,
+    "promosms": PromoSMS,
-    promosms: PromoSMS,
+    "pushbullet": Pushbullet,
-    pushbullet: Pushbullet,
+    "PushByTechulus": TechulusPush,
-    PushByTechulus: TechulusPush,
+    "PushDeer": PushDeer,
-    PushDeer: PushDeer,
+    "pushover": Pushover,
-    pushover: Pushover,
+    "pushy": Pushy,
-    pushy: Pushy,
     "rocket.chat": RocketChat,
-    serwersms: SerwerSMS,
+    "serwersms": SerwerSMS,
-    signal: Signal,
+    "signal": Signal,
-    SIGNL4: SIGNL4,
+    "SIGNL4": SIGNL4,
-    SMSManager: SMSManager,
+    "SMSManager": SMSManager,
-    SMSPartner: SMSPartner,
+    "SMSPartner": SMSPartner,
-    slack: Slack,
+    "slack": Slack,
-    squadcast: Squadcast,
+    "squadcast": Squadcast,
-    SMSEagle: SMSEagle,
+    "SMSEagle": SMSEagle,
-    smtp: STMP,
+    "smtp": STMP,
-    stackfield: Stackfield,
+    "stackfield": Stackfield,
-    teams: Teams,
+    "teams": Teams,
-    telegram: Telegram,
+    "telegram": Telegram,
-    threema: Threema,
+    "threema": Threema,
-    twilio: Twilio,
+    "twilio": Twilio,
-    Splunk: Splunk,
+    "Splunk": Splunk,
-    webhook: Webhook,
+    "webhook": Webhook,
-    WeCom: WeCom,
+    "WeCom": WeCom,
-    GoAlert: GoAlert,
+    "GoAlert": GoAlert,
-    ServerChan: ServerChan,
+    "ServerChan": ServerChan,
-    ZohoCliq: ZohoCliq,
+    "ZohoCliq": ZohoCliq,
-    SevenIO: SevenIO,
+    "SevenIO": SevenIO,
-    whapi: Whapi,
+    "whapi": Whapi,
-    gtxmessaging: GtxMessaging,
+    "gtxmessaging": GtxMessaging,
-    Cellsynt: Cellsynt,
+    "Cellsynt": Cellsynt,
-    WPush: WPush,
+    "WPush": WPush,
-    SendGrid: SendGrid,
+    "SendGrid": SendGrid,
 };
 
 export default NotificationFormList;

src/lang/en.json

@@ -429,9 +429,6 @@
     "trustProxyDescription": "Trust 'X-Forwarded-*' headers. If you want to get the correct client IP and your Uptime Kuma is behind a proxy such as Nginx or Apache, you should enable this.",
     "wayToGetLineNotifyToken": "You can get an access token from {0}",
     "Examples": "Examples",
-    "supportBaleChatID": "Support Direct Chat / Group / Channel's Chat ID",
-    "wayToGetBaleChatID": "You can get your chat ID by sending a message to the bot and going to this URL to view the chat_id:",
-    "wayToGetBaleToken": "You can get a token from {0}.",
     "Home Assistant URL": "Home Assistant URL",
     "Long-Lived Access Token": "Long-Lived Access Token",
     "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ": "Long-Lived Access Token can be created by clicking on your profile name (bottom left) and scrolling to the bottom then click Create Token. ",