post-merge adaptations

server/model/status_page.js

@@ -259,7 +259,7 @@ class StatusPage extends BeanModel {
      * Get all status page data in one call
      * @param {StatusPage} statusPage
      * @param {boolean} [includeStatus = false] whether each monitor should include the status of the monitor ("up" or "down")
-     * @param {boolean} [includeConfig = true] whether the config for the status paghe should be included in the returned JSON
+     * @param {boolean} [includeConfig = true] whether the config for the status page should be included in the returned JSON
      */
     static async getStatusPageData(statusPage, includeStatus = false, includeConfig = true) {
         // Incident
@@ -282,7 +282,7 @@ class StatusPage extends BeanModel {
         ]);
 
         for (let groupBean of list) {
-            let monitorGroup = await groupBean.toPublicJSON(showTags, includeStatus);
+            let monitorGroup = await groupBean.toPublicJSON(showTags, false, includeStatus);
             publicGroupList.push(monitorGroup);
         }
 

server/routers/status-page-router.js

@@ -2,7 +2,7 @@ let express = require("express");
 const apicache = require("../modules/apicache");
 const { UptimeKumaServer } = require("../uptime-kuma-server");
 const StatusPage = require("../model/status_page");
-const { allowDevAllOrigin, sendHttpError } = require("../util-server");
+const { allowAllOrigin, allowDevAllOrigin, sendHttpError } = require("../util-server");
 const { R } = require("redbean-node");
 const { badgeConstants } = require("../../src/util");
 const { makeBadge } = require("badge-maker");