Merge df2f76dbe3 into 03beef8006

Co-authored-by: Frank Elsinga <frank@elsinga.de>

server/model/heartbeat.js

@@ -40,6 +40,14 @@ class Heartbeat extends BeanModel {
         };
     }
 
+    /**
+     * TODO: Find the msg from the `msg` table and get the msg_id
+     * @param value
+     */
+    set msg(value) {
+        throw new Error("Not implemented yet")
+    }
+
 }
 
 module.exports = Heartbeat;

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]);