slack and rocket.chat use the primary base url

env var to show time logger

server/model/monitor.js

@@ -166,7 +166,9 @@ class Monitor extends BeanModel {
                         }
                     }
 
+                    if (process.env.TIMELOGGER === "1") {
                         debug("Cert Info Query Time: " + (dayjs().valueOf() - certInfoStartTime) + "ms");
+                    }
 
                     if (this.type === "http") {
                         bean.status = UP;
@@ -530,6 +532,7 @@ class Monitor extends BeanModel {
         const uptime = await this.calcUptime(duration, monitorID);
         io.to(userID).emit("uptime", monitorID, duration, uptime);
     }
+
 }
 
 module.exports = Monitor;

server/notification-providers/rocket-chat.js

@@ -1,5 +1,8 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
+const Slack = require("./slack");
+const { setting } = require("../util-server");
+const { getMonitorRelativeURL, UP, DOWN } = require("../../src/util");
 
 class RocketChat extends NotificationProvider {
 
@@ -10,16 +13,17 @@ class RocketChat extends NotificationProvider {
         try {
             if (heartbeatJSON == null) {
                 let data = {
-                    "text": "Uptime Kuma Rocket.chat testing successful.",
+                    "text": msg,
                     "channel": notification.rocketchannel,
                     "username": notification.rocketusername,
                     "icon_emoji": notification.rocketiconemo,
-                }
+                };
-                await axios.post(notification.rocketwebhookURL, data)
+                await axios.post(notification.rocketwebhookURL, data);
                 return okMsg;
             }
 
             const time = heartbeatJSON["time"];
+
             let data = {
                 "text": "Uptime Kuma Alert",
                 "channel": notification.rocketchannel,
@@ -28,16 +32,32 @@ class RocketChat extends NotificationProvider {
                 "attachments": [
                     {
                         "title": "Uptime Kuma Alert *Time (UTC)*\n" + time,
-                        "title_link": notification.rocketbutton,
                         "text": "*Message*\n" + msg,
-                        "color": "#32cd32"
                     }
                 ]
+            };
+
+            // Color
+            if (heartbeatJSON.status === DOWN) {
+                data.attachments[0].color = "#ff0000";
+            } else {
+                data.attachments[0].color = "#32cd32";
             }
-            await axios.post(notification.rocketwebhookURL, data)
+
+            if (notification.rocketbutton) {
+                await Slack.deprecateURL(notification.rocketbutton);
+            }
+
+            const baseURL = await setting("primaryBaseURL");
+
+            if (baseURL) {
+                data.attachments[0].title_link = baseURL + getMonitorRelativeURL(monitorJSON.id);
+            }
+
+            await axios.post(notification.rocketwebhookURL, data);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }

server/notification-providers/slack.js

@@ -1,21 +1,40 @@
 const NotificationProvider = require("./notification-provider");
 const axios = require("axios");
+const { setSettings, setting } = require("../util-server");
+const { getMonitorRelativeURL } = require("../../src/util");
 
 class Slack extends NotificationProvider {
 
     name = "slack";
 
+    /**
+     * Deprecated property notification.slackbutton
+     * Set it as primary base url if this is not yet set.
+     */
+    static async deprecateURL(url) {
+        let currentPrimaryBaseURL = await setting("primaryBaseURL");
+
+        if (!currentPrimaryBaseURL) {
+            console.log("Move the url to be the primary base URL");
+            await setSettings("general", {
+                primaryBaseURL: url,
+            });
+        } else {
+            console.log("Already there, no need to move the primary base URL");
+        }
+    }
+
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully. ";
         try {
             if (heartbeatJSON == null) {
                 let data = {
-                    "text": "Uptime Kuma Slack testing successful.",
+                    "text": msg,
                     "channel": notification.slackchannel,
                     "username": notification.slackusername,
                     "icon_emoji": notification.slackiconemo,
-                }
+                };
-                await axios.post(notification.slackwebhookURL, data)
+                await axios.post(notification.slackwebhookURL, data);
                 return okMsg;
             }
 
@@ -42,26 +61,35 @@ class Slack extends NotificationProvider {
                         "type": "mrkdwn",
                         "text": "*Time (UTC)*\n" + time,
                     }],
-                },
+                }],
-                {
+            };
+
+            if (notification.slackbutton) {
+                await Slack.deprecateURL(notification.slackbutton);
+            }
+
+            const baseURL = await setting("primaryBaseURL");
+
+            // Button
+            if (baseURL) {
+                data.blocks.push({
                     "type": "actions",
-                    "elements": [
+                    "elements": [{
-                        {
                         "type": "button",
                         "text": {
                             "type": "plain_text",
                             "text": "Visit Uptime Kuma",
                         },
                         "value": "Uptime-Kuma",
-                            "url": notification.slackbutton || "https://github.com/louislam/uptime-kuma",
+                        "url": baseURL + getMonitorRelativeURL(monitorJSON.id),
-                        },
-                    ],
                     }],
+                });
             }
-            await axios.post(notification.slackwebhookURL, data)
+
+            await axios.post(notification.slackwebhookURL, data);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }

src/components/MonitorList.vue

@@ -47,6 +47,7 @@
 import HeartbeatBar from "../components/HeartbeatBar.vue";
 import Uptime from "../components/Uptime.vue";
 import Tag from "../components/Tag.vue";
+import { getMonitorRelativeURL } from "../util.ts";
 
 export default {
     components: {
@@ -109,7 +110,7 @@ export default {
     },
     methods: {
         monitorURL(id) {
-            return "/dashboard/" + id;
+            return getMonitorRelativeURL(id);
         },
         clearSearchText() {
             this.searchText = "";

src/components/notifications/RocketChat.vue

@@ -8,8 +8,6 @@
         <input id="rocket-iconemo" v-model="$parent.notification.rocketiconemo" type="text" class="form-control">
         <label for="rocket-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="rocket-channel-name" v-model="$parent.notification.rocketchannel" type="text" class="form-control">
-        <label for="rocket-button-url" class="form-label">{{ $t("Uptime Kuma URL") }}</label>
-        <input id="rocket-button" v-model="$parent.notification.rocketbutton" type="text" class="form-control">
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">

src/components/notifications/Slack.vue

@@ -8,8 +8,7 @@
         <input id="slack-iconemo" v-model="$parent.notification.slackiconemo" type="text" class="form-control">
         <label for="slack-channel" class="form-label">{{ $t("Channel Name") }}</label>
         <input id="slack-channel-name" v-model="$parent.notification.slackchannel" type="text" class="form-control">
-        <label for="slack-button-url" class="form-label">{{ $t("Uptime Kuma URL") }}</label>
+
-        <input id="slack-button" v-model="$parent.notification.slackbutton" type="text" class="form-control">
         <div class="form-text">
             <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
             <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">

src/pages/Settings.vue

@@ -111,7 +111,7 @@
                                 <label class="form-label" for="primaryBaseURL">Primary Base URL</label>
 
                                 <div class="input-group mb-3">
-                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://">
+                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://" pattern="https?://.+">
                                     <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">Auto Get</button>
                                 </div>
 

src/util.js

@@ -7,7 +7,7 @@
 // Backend uses the compiled file util.js
 // Frontend uses util.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genSecret = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
+exports.getMonitorRelativeURL = exports.genSecret = exports.getRandomInt = exports.getRandomArbitrary = exports.TimeLogger = exports.polyfill = exports.debug = exports.ucfirst = exports.sleep = exports.flipStatus = exports.STATUS_PAGE_PARTIAL_DOWN = exports.STATUS_PAGE_ALL_UP = exports.STATUS_PAGE_ALL_DOWN = exports.PENDING = exports.UP = exports.DOWN = exports.appName = exports.isDev = void 0;
 const _dayjs = require("dayjs");
 const dayjs = _dayjs;
 exports.isDev = process.env.NODE_ENV === "development";
@@ -74,7 +74,7 @@ class TimeLogger {
         this.startTime = dayjs().valueOf();
     }
     print(name) {
-        if (exports.isDev) {
+        if (exports.isDev && process && process.env.TIMELOGGER === "1") {
             console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms");
         }
     }
@@ -112,3 +112,7 @@ function genSecret(length = 64) {
     return secret;
 }
 exports.genSecret = genSecret;
+function getMonitorRelativeURL(id) {
+    return "/dashboard/" + id;
+}
+exports.getMonitorRelativeURL = getMonitorRelativeURL;

src/util.ts

@@ -86,7 +86,7 @@ export class TimeLogger {
     }
 
     print(name: string) {
-        if (isDev) {
+        if (isDev && process && process.env.TIMELOGGER === "1") {
             console.log(name + ": " + (dayjs().valueOf() - this.startTime) + "ms")
         }
     }
@@ -123,3 +123,7 @@ export function genSecret(length = 64) {
     }
     return secret;
 }
+
+export function getMonitorRelativeURL(id: string) {
+    return "/dashboard/" + id;
+}