Merge branch 'louislam:master' into master

BuloZB · Oct 12, 2024 · 902deb4 · 902deb4
2 parents fe65961 + dda4061
commit 902deb4
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 5 deletions.
diff --git a/server/notification-providers/46elks.js b/server/notification-providers/46elks.js
@@ -0,0 +1,35 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class Elks extends NotificationProvider {
+    name = "Elks";
+
+    /**
+     * @inheritdoc
+     */
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        const okMsg = "Sent Successfully.";
+        const url = "https://api.46elks.com/a1/sms";
+
+        try {
+            let data = new URLSearchParams();
+            data.append("from", notification.elksFromNumber);
+            data.append("to", notification.elksToNumber );
+            data.append("message", msg);
+
+            const config = {
+                headers: {
+                    "Authorization": "Basic " + Buffer.from(`${notification.elksUsername}:${notification.elksAuthToken}`).toString("base64")
+                }
+            };
+
+            await axios.post(url, data, config);
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = Elks;
diff --git a/server/notification-providers/techulus-push.js b/server/notification-providers/techulus-push.js
@@ -10,11 +10,22 @@ class TechulusPush extends NotificationProvider {
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         const okMsg = "Sent Successfully.";
 
+        let data = {
+            "title": notification?.pushTitle?.length ? notification.pushTitle : "Uptime-Kuma",
+            "body": msg,
+            "timeSensitive": notification.pushTimeSensitive ?? true,
+        };
+
+        if (notification.pushChannel) {
+            data.channel = notification.pushChannel;
+        }
+
+        if (notification.pushSound) {
+            data.sound = notification.pushSound;
+        }
+
         try {
-            await axios.post(`https://push.techulus.com/api/v1/notify/${notification.pushAPIKey}`, {
-                "title": "Uptime-Kuma",
-                "body": msg,
-            });
+            await axios.post(`https://push.techulus.com/api/v1/notify/${notification.pushAPIKey}`, data);
             return okMsg;
         } catch (error) {
             this.throwGeneralAxiosError(error);

diff --git a/server/notification.js b/server/notification.js
@@ -11,6 +11,7 @@ const CallMeBot = require("./notification-providers/call-me-bot");
 const SMSC = require("./notification-providers/smsc");
 const DingDing = require("./notification-providers/dingding");
 const Discord = require("./notification-providers/discord");
+const Elks = require("./notification-providers/46elks");
 const Feishu = require("./notification-providers/feishu");
 const FreeMobile = require("./notification-providers/freemobile");
 const GoogleChat = require("./notification-providers/google-chat");
@@ -95,6 +96,7 @@ class Notification {
             new SMSC(),
             new DingDing(),
             new Discord(),
+            new Elks(),
             new Feishu(),
             new FreeMobile(),
             new GoogleChat(),

diff --git a/src/components/NotificationDialog.vue b/src/components/NotificationDialog.vue
@@ -118,6 +118,7 @@ export default {
                 "clicksendsms": "ClickSend SMS",
                 "CallMeBot": "CallMeBot (WhatsApp, Telegram Call, Facebook Messanger)",
                 "discord": "Discord",
+                "Elks": "46elks",
                 "GoogleChat": "Google Chat (Google Workspace)",
                 "gorush": "Gorush",
                 "gotify": "Gotify",

diff --git a/src/components/notifications/46elks.vue b/src/components/notifications/46elks.vue
@@ -0,0 +1,48 @@
+<template>
+    <div class="mb-3">
+        <label for="ElksUsername" class="form-label">{{ $t("Username") }}</label>
+        <input id="ElksUsername" v-model="$parent.notification.elksUsername" type="text" class="form-control" required>
+        <label for="ElksPassword" class="form-label">{{ $t("Password") }}</label>
+    </div>
+    <div class="form-text">
+        <HiddenInput id="ElksPassword" v-model="$parent.notification.elksAuthToken" :required="true" autocomplete="new-password"></HiddenInput>
+        <i18n-t tag="p" keypath="Can be found on:">
+            <a href="https://46elks.com/account" target="_blank">https://46elks.com/account</a>
+        </i18n-t>
+    </div>
+    <div class="mb-3">
+        <label for="Elks-from-number" class="form-label">{{ $t("From") }}</label>
+        <input id="Elks-from-number" v-model="$parent.notification.elksFromNumber" type="text" class="form-control" required>
+        <div class="form-text">
+            {{ $t("Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.") }}
+            <i18n-t tag="p" keypath="More info on:">
+                <a href="https://46elks.se/kb/text-sender-id" target="_blank">https://46elks.se/kb/text-sender-id</a>
+            </i18n-t>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="Elks-to-number" class="form-label">{{ $t("To Number") }}</label>
+        <input id="Elks-to-number" v-model="$parent.notification.elksToNumber" type="text" class="form-control" required>
+        <div class="form-text">
+            {{ $t("The phone number of the recipient in E.164 format.") }}
+            <i18n-t tag="p" keypath="More info on:">
+                <a href="https://46elks.se/kb/e164" target="_blank">https://46elks.se/kb/e164</a>
+            </i18n-t>
+        </div>
+    </div>
+
+    <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
+        <a href="https://46elks.com/docs/send-sms" target="_blank">https://46elks.com/docs/send-sms</a>
+    </i18n-t>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>
diff --git a/src/components/notifications/TechulusPush.vue b/src/components/notifications/TechulusPush.vue
@@ -4,6 +4,53 @@
         <HiddenInput id="push-api-key" v-model="$parent.notification.pushAPIKey" :required="true" autocomplete="new-password"></HiddenInput>
     </div>
 
+    <div class="mb-3">
+        <label for="push-api-title" class="form-label">{{ $t("Title") }}</label>
+        <input id="push-api-title" v-model="$parent.notification.pushTitle" type="text" class="form-control">
+    </div>
+
+    <div class="mb-3">
+        <label for="push-api-channel" class="form-label">{{ $t("Notification Channel") }}</label>
+        <input id="push-api-channel" v-model="$parent.notification.pushChannel" type="text" class="form-control" patttern="[A-Za-z0-9-]+">
+        <div class="form-text">
+            {{ $t("Alphanumerical string and hyphens only") }}
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <label for="push-api-sound" class="form-label">{{ $t("Sound") }}</label>
+        <select id="push-api-sound" v-model="$parent.notification.pushSound" class="form-select">
+            <option value="default">{{ $t("Default") }}</option>
+            <option value="arcade">{{ $t("Arcade") }}</option>
+            <option value="correct">{{ $t("Correct") }}</option>
+            <option value="fail">{{ $t("Fail") }}</option>
+            <option value="harp">{{ $t("Harp") }}</option>
+            <option value="reveal">{{ $t("Reveal") }}</option>
+            <option value="bubble">{{ $t("Bubble") }}</option>
+            <option value="doorbell">{{ $t("Doorbell") }}</option>
+            <option value="flute">{{ $t("Flute") }}</option>
+            <option value="money">{{ $t("Money") }}</option>
+            <option value="scifi">{{ $t("Scifi") }}</option>
+            <option value="clear">{{ $t("Clear") }}</option>
+            <option value="elevator">{{ $t("Elevator") }}</option>
+            <option value="guitar">{{ $t("Guitar") }}</option>
+            <option value="pop">{{ $t("Pop") }}</option>
+        </select>
+        <div class="form-text">
+            {{ $t("Custom sound to override default notification sound") }}
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <div class="form-check form-switch">
+            <input v-model="$parent.notification.pushTimeSensitive" class="form-check-input" type="checkbox">
+            <label class="form-check-label">{{ $t("Time Sensitive (iOS Only)") }}</label>
+        </div>
+        <div class="form-text">
+            {{ $t("Time sensitive notifications will be delivered immediately, even if the device is in do not disturb mode.") }}
+        </div>
+    </div>
+
     <i18n-t tag="p" keypath="More info on:" style="margin-top: 8px;">
         <a href="https://docs.push.techulus.com" target="_blank">https://docs.push.techulus.com</a>
     </i18n-t>
@@ -16,5 +63,19 @@ export default {
     components: {
         HiddenInput,
     },
+    mounted() {
+        if (typeof this.$parent.notification.pushTitle === "undefined") {
+            this.$parent.notification.pushTitle = "Uptime-Kuma";
+        }
+        if (typeof this.$parent.notification.pushChannel === "undefined") {
+            this.$parent.notification.pushChannel = "uptime-kuma";
+        }
+        if (typeof this.$parent.notification.pushSound === "undefined") {
+            this.$parent.notification.pushSound = "default";
+        }
+        if (typeof this.$parent.notification.pushTimeSensitive === "undefined") {
+            this.$parent.notification.pushTimeSensitive = true;
+        }
+    },
 };
 </script>
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
@@ -9,6 +9,7 @@ import CallMeBot from "./CallMeBot.vue";
 import SMSC from "./SMSC.vue";
 import DingDing from "./DingDing.vue";
 import Discord from "./Discord.vue";
+import Elks from "./46elks.vue";
 import Feishu from "./Feishu.vue";
 import FreeMobile from "./FreeMobile.vue";
 import GoogleChat from "./GoogleChat.vue";
@@ -82,6 +83,7 @@ const NotificationFormList = {
     "smsc": SMSC,
     "DingDing": DingDing,
     "discord": Discord,
+    "Elks": Elks,
     "Feishu": Feishu,
     "FreeMobile": FreeMobile,
     "GoogleChat": GoogleChat,

diff --git a/src/lang/en.json b/src/lang/en.json
@@ -1027,5 +1027,29 @@
     "greater than": "greater than",
     "less than or equal to": "less than or equal to",
     "greater than or equal to": "greater than or equal to",
-    "record": "record"
+    "record": "record",
+    "Notification Channel": "Notification Channel",
+    "Sound": "Sound",
+    "Alphanumerical string and hyphens only": "Alphanumerical string and hyphens only",
+    "Arcade": "Arcade",
+    "Correct": "Correct",
+    "Fail":"Fail",
+    "Harp":"Harp",
+    "Reveal":"Reveal",
+    "Bubble":"Bubble",
+    "Doorbell":"Doorbell",
+    "Flute":"Flute",
+    "Money":"Money",
+    "Scifi":"Scifi",
+    "Clear":"Clear",
+    "Elevator":"Elevator",
+    "Guitar":"Guitar",
+    "Pop":"Pop",
+    "Custom sound to override default notification sound": "Custom sound to override default notification sound",
+    "Time Sensitive (iOS Only)": "Time Sensitive (iOS Only)",
+    "Time sensitive notifications will be delivered immediately, even if the device is in do not disturb mode.": "Time sensitive notifications will be delivered immediately, even if the device is in do not disturb mode.",
+    "From":"From",
+    "Can be found on:": "Can be found on: {0}",
+    "The phone number of the recipient in E.164 format.": "The phone number of the recipient in E.164 format.",
+    "Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies.":"Either a text sender ID or a phone number in E.164 format if you want to be able to receive replies."
 }