Merge pull request #22 from TheGuyDanish/master

Discord notification rework

package-lock.json

@@ -28,21 +28,6 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@discordjs/collection": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.1.6.tgz",
-      "integrity": "sha512-utRNxnd9kSS2qhyivo9lMlt5qgAUasH2gb7BEOn6p0efFh24gjGomHzWKMAPn2hEReOPQZCJaRKoURwRotKucQ=="
-    },
-    "@discordjs/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@discordjs/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-ZfFsbgEXW71Rw/6EtBdrP5VxBJy4dthyC0tpQKGKmYFImlmmrykO14Za+BiIVduwjte0jXEBlhSKf0MWbFp9Eg==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
     "@popperjs/core": {
       "version": "2.9.2",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
@@ -184,14 +169,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "requires": {
-        "event-target-shim": "^5.0.0"
-      }
-    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -792,28 +769,6 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
     },
-    "discord.js": {
-      "version": "12.5.3",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.3.tgz",
-      "integrity": "sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw==",
-      "requires": {
-        "@discordjs/collection": "^0.1.6",
-        "@discordjs/form-data": "^3.0.1",
-        "abort-controller": "^3.0.0",
-        "node-fetch": "^2.6.1",
-        "prism-media": "^1.2.9",
-        "setimmediate": "^1.0.5",
-        "tweetnacl": "^1.0.3",
-        "ws": "^7.4.4"
-      },
-      "dependencies": {
-        "tweetnacl": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
-          "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
-        }
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -919,11 +874,6 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
-    "event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -2192,11 +2142,6 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
       "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
     },
-    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
-    },
     "node-gyp": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
@@ -2657,11 +2602,6 @@
       "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
-    "prism-media": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.1.tgz",
-      "integrity": "sha512-nyYAa3KB4qteJIqdguKmwxTJgy55xxUtkJ3uRnOvO5jO+frci+9zpRXw6QZVcfDeva3S654fU9+26P2OSTzjHw=="
-    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -3005,11 +2945,6 @@
         }
       }
     },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",

package.json

@@ -15,7 +15,6 @@
         "axios": "^0.21.1",
         "bootstrap": "^5.0.0",
         "dayjs": "^1.10.4",
-        "discord.js": "^12.5.3",
         "express": "^4.17.1",
         "form-data": "^4.0.0",
         "jsonwebtoken": "^8.5.1",

server/notification.js

@@ -2,7 +2,6 @@ const axios = require("axios");
 const {R} = require("redbean-node");
 const FormData = require('form-data');
 const nodemailer = require("nodemailer");
-const Discord = require('discord.js');
 
 class Notification {
     static async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
@@ -54,8 +53,45 @@ class Notification {
             return await Notification.smtp(notification, msg)
 
         } else if (notification.type === "discord") {
-            return await Notification.discord(notification, msg)
+            try {
-
+              // If heartbeatJSON is null, assume we're testing.
+              if(heartbeatJSON == null) {
+                let data = {
+                  username: 'Uptime-Kuma',
+                  content: msg
+                }
+                let res = await axios.post(notification.discordWebhookUrl, data)
+                return true;
+              }
+              // If heartbeatJSON is not null, we go into the normal alerting loop.
+              if(heartbeatJSON['status'] == 0) {
+                var alertColor = "16711680";
+              } else if(heartbeatJSON['status'] == 1) {
+                var alertColor = "65280";
+              }
+              let data = {
+                username: 'Uptime-Kuma',
+                embeds: [{
+                  title: "Uptime-Kuma Alert",
+                  color: alertColor,
+                  fields: [
+                    {
+                      name: "Time (UTC)",
+                      value: heartbeatJSON["time"]
+                    },
+                    {
+                      name: "Message",
+                      value: msg
+                    }
+                  ]
+                }]
+              }
+              let res = await axios.post(notification.discordWebhookUrl, data)
+              return true;
+            } catch(error) {
+              console.log(error)
+              return false;
+            }
         } else {
             throw new Error("Notification type is not supported")
         }
@@ -119,18 +155,6 @@ class Notification {
 
         return true;
     }
-
-    static async discord(notification, msg) {
-        const client = new Discord.Client();
-        await client.login(notification.discordToken)
-
-        const channel = await client.channels.fetch(notification.discordChannelID);
-        await channel.send(msg);
-
-        client.destroy()
-
-        return true;
-    }
 }
 
 module.exports = {

src/components/NotificationDialog.vue

@@ -127,19 +127,9 @@
 
                         <template v-if="notification.type === 'discord'">
                             <div class="mb-3">
-                                <label for="discord-token" class="form-label">Discord Bot Token</label>
+                                <label for="discord-webhook-url" class="form-label">Discord Webhook URL</label>
-                                <input type="text" class="form-control" id="discord-token" required v-model="notification.discordToken" autocomplete="false">
+                                <input type="text" class="form-control" id="discord-webhook-url" required v-model="notification.discordWebhookUrl" autocomplete="false">
-                                <div class="form-text">You should create a Discord app and create a bot from <a href="https://discord.com/developers/applications" target="_blank">here</a>.</div>
+                                <div class="form-text">You can get this by going to Server Settings -> Integrations -> Create Webhook</div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label for="discordChannelID" class="form-label">Channel ID</label>
-                                <input type="text" class="form-control" id="discordChannelID" required v-model="notification.discordChannelID" autocomplete="false">
-                                <div class="form-text">
-                                    You should add the bot to your channel. <br />
-                                    <a href="https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-" target="_blank">Where can I find the channel id?</a><br />
-                                    <a href="https://discordapi.com/permissions.html#8" target="_blank">How to add a bot to your channel?</a>
-                                </div>
                             </div>
                         </template>