diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js
index 6a52f8f3e..e74c0c5b7 100644
--- a/server/notification-providers/discord.js
+++ b/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;
}
+ const embedFields = [
+ {
+ name: "Service Name",
+ value: monitorJSON.name,
+ },
+ ...(hasAddress ? [{
+ name: "Service URL",
+ value: address
+ }] : []),
+ {
+ name: `Time (${heartbeatJSON.timezone})`,
+ value: heartbeatJSON.localDateTime,
+ },
+ {
+ name: "Error",
+ 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) {
- let discorddowndata = {
+ if (heartbeatJSON.status === DOWN) {
+ const discorddowndata = {
username: discordDisplayName,
+ content: notification.discordPrefixMessage || "",
embeds: [{
- title: "❌ Your service " + monitorJSON["name"] + " went down. ❌",
+ title: `❌ Your service ${monitorJSON.name} went down. ❌`,
color: 16711680,
- timestamp: heartbeatJSON["time"],
- fields: [
- {
- 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: "Error",
- value: heartbeatJSON["msg"] == null ? "N/A" : heartbeatJSON["msg"],
- },
- ],
+ 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) {
- let discordupdata = {
+ if (heartbeatJSON.status === UP) {
+ 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"],
- fields: [
- {
- 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",
- },
- ],
+ timestamp: heartbeatJSON.time,
+ fields: embedFields,
}],
+ 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);
}
}
diff --git a/src/components/notifications/Discord.vue b/src/components/notifications/Discord.vue
index 5d8334f5f..966da93e3 100644
--- a/src/components/notifications/Discord.vue
+++ b/src/components/notifications/Discord.vue
@@ -4,6 +4,12 @@
diff --git a/src/lang/en.json b/src/lang/en.json
index e215f1031..ac68916e6 100644
--- a/src/lang/en.json
+++ b/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…",