Merge f3fbea8e53 into 03beef8006

BugFix:Regular Expression in parseDuration Function (#5563 )
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-02-26 05:25:56 +00:00 · 2025-01-22 18:03:54 +00:00 · 2025-01-22 19:03:38 +01:00 · 2024-12-25 16:26:38 -06:00
2 changed files with 2 additions and 1 deletions
--- 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]);
--- 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: {
Author	SHA1	Message	Date
Elliot Matson	b30b9173f6	Merge `f3fbea8e53` into `03beef8006`	2025-01-22 18:03:54 +00:00
DayShift	03beef8006	BugFix:Regular Expression in parseDuration Function (#5563 ) Some checks failed CodeQL / Analyze (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / check-linters (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-22 19:03:38 +01:00
Elliot Matson	f3fbea8e53	Add fallback text Adding fallback text to use in notifications and platforms that don't support cards	2024-12-25 16:26:38 -06:00