Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors

# Conflicts:
#	src/lang/en.json

server/routers/api-router.js

@@ -4,7 +4,7 @@ const { R } = require("redbean-node");
 const apicache = require("../modules/apicache");
 const Monitor = require("../model/monitor");
 const dayjs = require("dayjs");
-const { UP, MAINTENANCE, DOWN, flipStatus, log } = require("../../src/util");
+const { UP, MAINTENANCE, DOWN, PENDING, flipStatus, log } = require("../../src/util");
 const StatusPage = require("../model/status_page");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const { makeBadge } = require("badge-maker");
@@ -147,19 +147,19 @@ router.get("/api/badge/:id/status", cache("5 minutes"), async (request, response
 
             badgeValues.label = label ?? "";
             switch (state) {
-                case 0:
+                case DOWN:
                     badgeValues.color = downColor;
                     badgeValues.message = downLabel;
                     break;
-                case 1:
+                case UP:
                     badgeValues.color = upColor;
                     badgeValues.message = upLabel;
                     break;
-                case 2:
+                case PENDING:
                     badgeValues.color = pendingColor;
                     badgeValues.message = pendingLabel;
                     break;
-                case 3:
+                case MAINTENANCE:
                     badgeValues.color = maintenanceColor;
                     badgeValues.message = maintenanceLabel;
                     break;

server/server.js

@@ -11,6 +11,9 @@ dayjs.extend(require("dayjs/plugin/utc"));
 dayjs.extend(require("./modules/dayjs/plugin/timezone"));
 dayjs.extend(require("dayjs/plugin/customParseFormat"));
 
+// Load environment variables from `.env`
+require("dotenv").config();
+
 // Check Node.js Version
 const nodeVersion = parseInt(process.versions.node.split(".")[0]);
 const requiredVersion = 14;