From 14fffcf06bbcbf095a71fcdeaca5d3584b0c8173 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 24 Dec 2022 14:23:50 +0800 Subject: [PATCH] Globally fix if heartbeatJSON["msg"] is undefined --- server/model/monitor.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 6c6ccbcc..cb60156c 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -1069,7 +1069,13 @@ class Monitor extends BeanModel { for (let notification of notificationList) { try { - await Notification.send(JSON.parse(notification.config), msg, await monitor.toJSON(false), bean.toJSON()); + // Prevent if the msg is undefined, notifications such as Discord cannot send out. + const heartbeatJSON = bean.toJSON(); + if (!heartbeatJSON["msg"]) { + heartbeatJSON["msg"] = ""; + } + + await Notification.send(JSON.parse(notification.config), msg, await monitor.toJSON(false), heartbeatJSON); } catch (e) { log.error("monitor", "Cannot send notification to " + notification.name); log.error("monitor", e);