From 03beef800652be3508ef641867cde75d7f3c8ee4 Mon Sep 17 00:00:00 2001 From: DayShift <113507098+ShiyuBanzhou@users.noreply.github.com> Date: Thu, 23 Jan 2025 02:03:38 +0800 Subject: [PATCH 1/2] BugFix:Regular Expression in parseDuration Function (#5563) Co-authored-by: Frank Elsinga --- server/modules/apicache/apicache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/apicache/apicache.js b/server/modules/apicache/apicache.js index 41930b24d..95a04d9e3 100644 --- a/server/modules/apicache/apicache.js +++ b/server/modules/apicache/apicache.js @@ -485,7 +485,7 @@ function ApiCache() { } if (typeof duration === "string") { - let split = duration.match(/^([\d\.,]+)\s?(\w+)$/); + let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/); if (split.length === 3) { let len = parseFloat(split[1]); From 7dc6191b0af91edf58b7938876aa862c2a4ac9bb Mon Sep 17 00:00:00 2001 From: Elliot Matson Date: Fri, 24 Jan 2025 11:49:29 -0600 Subject: [PATCH 2/2] fix: add notification-fallback for better google chat popups (#5476) Co-authored-by: Frank Elsinga --- server/notification-providers/google-chat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/notification-providers/google-chat.js b/server/notification-providers/google-chat.js index 0b72fea95..9e94844d7 100644 --- a/server/notification-providers/google-chat.js +++ b/server/notification-providers/google-chat.js @@ -72,6 +72,7 @@ class GoogleChat extends NotificationProvider { // construct json data let data = { + fallbackText: chatHeader["title"], cardsV2: [ { card: {