Updates regex for discord url and fixes auto not working

Author: KSJaay

server/database/queries/heartbeat.js

@@ -43,13 +43,17 @@ export const isMonitorDown = async (monitorId, limit = 1) => {
   const limitHeartbeats = heartbeats.slice(0, newLimit);
   const allDown = limitHeartbeats.every((heartbeat) => heartbeat.isDown);
 
-  if (oldestHeartbeat.isDown && allDown) {
+  if (!oldestHeartbeat) {
+    return false;
+  }
+
+  if (oldestHeartbeat?.isDown && allDown) {
     return false;
   }
 
   if (
     limitHeartbeats.every((heartbeat) => heartbeat.isDown) &&
-    !oldestHeartbeat.isDown
+    !oldestHeartbeat?.isDown
   ) {
     return limitHeartbeats[0];
   }

server/middleware/monitor/add.js

@@ -7,6 +7,7 @@ import { cleanMonitor } from '../../class/monitor/index.js';
 import { createMonitor } from '../../database/queries/monitor.js';
 import { fetchHeartbeats } from '../../database/queries/heartbeat.js';
 import { fetchCertificate } from '../../database/queries/certificate.js';
+import statusCache from '../../cache/status.js';
 
 const stringifyJson = (obj, asArray = false) => {
   try {
@@ -146,6 +147,12 @@ const monitorAdd = async (request, response) => {
       cert,
     });
 
+    console.log(`Adding monitor ${monitor.monitorId} to status cache`);
+
+    await statusCache
+      .loadMonitorData(monitor.monitorId)
+      .catch((error) => console.log(error));
+
     return response.json(monitor);
   } catch (error) {
     return handleError(error, response);

server/utils/status.js

@@ -1,7 +1,7 @@
 const layoutCheck = (layout) => {
   return (
     (layout.type === 'metrics' && layout.autoAdd) ||
-    (layout.type === 'uptime' && layout.graphType !== 'Basic' && layout.autoAdd)
+    (layout.type === 'uptime' && layout.autoAdd)
   );
 };
 

shared/validators/notifications/discord.js

@@ -8,7 +8,7 @@ import { NotificationValidatorError } from '../../utils/errors.js';
 const friendlyNameRegex = /^[a-zA-Z0-9_-]+$/;
 const messageTypes = ['basic', 'pretty', 'nerdy'];
 const tokenRegex =
-  /^https:\/\/(?:discord\.com|discordapp\.com)\/api\/webhooks\/[0-9]+\/[0-9a-zA-Z_.-]+$/;
+  /^https:\/\/(?:discord\.com|discordapp\.com)\/api\/webhooks\/[0-9]+\/[0-9a-zA-Z_.-]+(\?thread_id=[0-9]+)?$/;
 const usernameRegex = /^[a-zA-Z0-9_]{1,32}$/;
 
 const Discord = ({