Merge 64f528456d into 8a432ac937

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

server/notification-providers/discord.js

@@ -1,6 +1,7 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
-const { DOWN, UP } = require("../../src/util");
+const { Settings } = require("../settings");
+const { DOWN, UP, getMonitorRelativeURL } = require("../../src/util");
 
 class Discord extends NotificationProvider {
     name = "discord";
@@ -19,8 +20,13 @@ class Discord extends NotificationProvider {
             }
 
             // If heartbeatJSON is null, assume we're testing.
+
+            const baseURL = await Settings.get("primaryBaseURL");
+            const address = this.extractAddress(monitorJSON);
+            const hasAddress = address !== "" && address !== monitorJSON.hostname;
+
             if (heartbeatJSON == null) {
-                let discordtestdata = {
+                const discordtestdata = {
                     username: discordDisplayName,
                     content: msg,
                 };
@@ -33,84 +39,89 @@ class Discord extends NotificationProvider {
                 return okMsg;
             }
 
-            // If heartbeatJSON is not null, we go into the normal alerting loop.
+            const embedFields = [
-            if (heartbeatJSON["status"] === DOWN) {
-                let discorddowndata = {
-                    username: discordDisplayName,
-                    embeds: [{
-                        title: "❌ Your service " + monitorJSON["name"] + " went down. ❌",
-                        color: 16711680,
-                        timestamp: heartbeatJSON["time"],
-                        fields: [
                 {
                     name: "Service Name",
-                                value: monitorJSON["name"],
+                    value: monitorJSON.name,
                 },
+                ...(hasAddress ? [{
+                    name: "Service URL",
+                    value: address
+                }] : []),
                 {
-                                name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
+                    name: `Time (${heartbeatJSON.timezone})`,
-                                value: this.extractAddress(monitorJSON),
+                    value: heartbeatJSON.localDateTime,
-                            },
-                            {
-                                name: `Time (${heartbeatJSON["timezone"]})`,
-                                value: heartbeatJSON["localDateTime"],
                 },
                 {
                     name: "Error",
-                                value: heartbeatJSON["msg"] == null ? "N/A" : heartbeatJSON["msg"],
+                    value: msg,
                 },
-                        ],
+            ];
+
+            const components = [
+                {
+                    type: 1, // Action Row
+                    components: [
+                        baseURL && {
+                            type: 2, // Button
+                            style: 5, // Link Button,
+                            label: "Visit Uptime Kuma",
+                            url: baseURL + getMonitorRelativeURL(monitorJSON.id)
+                        },
+                        hasAddress && {
+                            type: 2, // Button
+                            style: 5, // Link Button,
+                            label: "Visit Service URL",
+                            url: address
+                        }
+                    ].filter(Boolean) // remove invalid data
+                }
+            ];
+
+            // If heartbeatJSON is not null, we go into the normal alerting loop.
+            if (heartbeatJSON.status === DOWN) {
+                const discorddowndata = {
+                    username: discordDisplayName,
+                    content: notification.discordPrefixMessage || "",
+                    embeds: [{
+                        title: `❌ Your service ${monitorJSON.name} went down. ❌`,
+                        color: 16711680,
+                        timestamp: heartbeatJSON.time,
+                        fields: embedFields,
                     }],
+                    components: components,
                 };
+
                 if (notification.discordChannelType === "createNewForumPost") {
                     discorddowndata.thread_name = notification.postName;
                 }
-                if (notification.discordPrefixMessage) {
-                    discorddowndata.content = notification.discordPrefixMessage;
-                }
 
                 await axios.post(webhookUrl.toString(), discorddowndata);
                 return okMsg;
+            }
 
-            } else if (heartbeatJSON["status"] === UP) {
+            if (heartbeatJSON.status === UP) {
-                let discordupdata = {
+                const discordupdata = {
                     username: discordDisplayName,
+                    content: notification.discordPrefixMessage || "",
                     embeds: [{
-                        title: "✅ Your service " + monitorJSON["name"] + " is up! ✅",
+                        title: `✅ Your service ${monitorJSON.name} is up! ✅`,
                         color: 65280,
-                        timestamp: heartbeatJSON["time"],
+                        timestamp: heartbeatJSON.time,
-                        fields: [
+                        fields: embedFields,
-                            {
-                                name: "Service Name",
-                                value: monitorJSON["name"],
-                            },
-                            {
-                                name: monitorJSON["type"] === "push" ? "Service Type" : "Service URL",
-                                value: this.extractAddress(monitorJSON),
-                            },
-                            {
-                                name: `Time (${heartbeatJSON["timezone"]})`,
-                                value: heartbeatJSON["localDateTime"],
-                            },
-                            {
-                                name: "Ping",
-                                value: heartbeatJSON["ping"] == null ? "N/A" : heartbeatJSON["ping"] + " ms",
-                            },
-                        ],
                     }],
+                    components: components,
                 };
 
                 if (notification.discordChannelType === "createNewForumPost") {
                     discordupdata.thread_name = notification.postName;
                 }
 
-                if (notification.discordPrefixMessage) {
-                    discordupdata.content = notification.discordPrefixMessage;
-                }
-
                 await axios.post(webhookUrl.toString(), discordupdata);
                 return okMsg;
             }
         } catch (error) {
+            console.log(error);
             this.throwGeneralAxiosError(error);
         }
     }

server/socket-handlers/status-page-socket-handler.js

@@ -220,6 +220,9 @@ module.exports.statusPageSocketHandler = (socket) => {
 
             // Delete groups that are not in the list
             log.debug("socket", "Delete groups that are not in the list");
+            if (groupIDList.length === 0) {
+                await R.exec("DELETE FROM `group` WHERE status_page_id = ?", [ statusPage.id ]);
+            } else {
                 const slots = groupIDList.map(() => "?").join(",");
 
                 const data = [
@@ -227,6 +230,7 @@ module.exports.statusPageSocketHandler = (socket) => {
                     statusPage.id
                 ];
                 await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
+            }
 
             const server = UptimeKumaServer.getInstance();
 

src/components/notifications/Discord.vue

@@ -4,6 +4,12 @@
         <input id="discord-webhook-url" v-model="$parent.notification.discordWebhookUrl" type="text" class="form-control" required autocomplete="false">
         <div class="form-text">
             {{ $t("wayToGetDiscordURL") }}
+            <i18n-t keypath="wayToGetDiscordURLEnhanced">
+                <a
+                    href="https://discord.com/developers/docs/resources/webhook#create-webhook"
+                    target="_blank"
+                >{{ $t("withADiscordBot") }}</a>
+            </i18n-t>
         </div>
     </div>
 

src/lang/en.json

@@ -531,6 +531,8 @@
     "smtpBCC": "BCC",
     "Discord Webhook URL": "Discord Webhook URL",
     "wayToGetDiscordURL": "You can get this by going to Server Settings -> Integrations -> View Webhooks -> New Webhook",
+    "wayToGetDiscordURLEnhanced": "Using the Discord API, you may also create the webhook {0} for button support.",
+    "withADiscordBot": "with a bot",
     "Bot Display Name": "Bot Display Name",
     "Prefix Custom Message": "Prefix Custom Message",
     "Hello @everyone is...": "Hello {'@'}everyone is…",