Merge branch 'master' into feature/add-channel-notification-for-slack

2025-09-24 06:29:20 +08:00 · 2023-05-31 10:31:33 -05:00
parent 9c3bb67b6b 4b3a2ee71b
commit 376d84c742
29 changed files with 1174 additions and 550 deletions
--- a/server/notification-providers/slack.js
+++ b/server/notification-providers/slack.js
@@ -44,7 +44,6 @@ class Slack extends NotificationProvider {
                return okMsg;
            }

-            const time = heartbeatJSON["time"];
            const textMsg = "Uptime Kuma Alert";
            let data = {
                "text": `${textMsg}\n${msg}`,
@@ -70,7 +69,7 @@ class Slack extends NotificationProvider {
                                },
                                {
                                    "type": "mrkdwn",
-                                    "text": "*Time (UTC)*\n" + time,
+                                    "text": `*Time (${heartbeatJSON["timezone"]})*\n${heartbeatJSON["localDateTime"]}`,
                                }],
                            }
                        ],