Merge branch 'master' into feat/status-page-summary-api

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "uptime-kuma",
-    "version": "2.0.0-dev",
+    "version": "2.0.0-beta.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "uptime-kuma",
-            "version": "2.0.0-dev",
+            "version": "2.0.0-beta.0",
             "license": "MIT",
             "dependencies": {
                 "@grpc/grpc-js": "~1.8.22",

server/database.js

@@ -892,11 +892,13 @@ class Database {
                 AND important = 0
                 AND time < ${sqlHourOffset}
                 AND id NOT IN (
-                    SELECT id
+                    SELECT id FROM ( -- written this way for Maria's support
-                    FROM heartbeat
+                        SELECT id
-                    WHERE monitor_id = ?
+                        FROM heartbeat
-                    ORDER BY time DESC
+                        WHERE monitor_id = ?
-                    LIMIT ?
+                        ORDER BY time DESC
+                        LIMIT ?
+                    )  AS limited_ids
                 )
             `, [
                 monitor.id,