fix discord notification appended port unexpectedly

This commit is contained in:
LouisLam 2021-08-31 22:15:02 +08:00
parent 527e0c3444
commit 697fa6bdfd

View File

@ -96,9 +96,16 @@ class Notification {
return okMsg; return okMsg;
} }
let url = monitorJSON["url"] === "https://" ? monitorJSON["hostname"] : monitorJSON["url"] let url;
if (monitorJSON["port"]) {
url += ":" + monitorJSON[port]; if (monitorJSON["type"] === "port") {
url = monitorJSON["hostname"];
if (monitorJSON["port"]) {
url += ":" + monitorJSON["port"];
}
} else {
url = monitorJSON["url"];
} }
// If heartbeatJSON is not null, we go into the normal alerting loop. // If heartbeatJSON is not null, we go into the normal alerting loop.
@ -331,7 +338,7 @@ class Notification {
await axios.post(notification.mattermostWebhookUrl, mattermostTestData) await axios.post(notification.mattermostWebhookUrl, mattermostTestData)
return okMsg; return okMsg;
} }
const mattermostChannel = notification.mattermostchannel; const mattermostChannel = notification.mattermostchannel;
const mattermostIconEmoji = notification.mattermosticonemo; const mattermostIconEmoji = notification.mattermosticonemo;
const mattermostIconUrl = notification.mattermosticonurl; const mattermostIconUrl = notification.mattermosticonurl;