7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-08 10:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change DateTime Range using serverTimezone

Browse Source
This commit is contained in:
Louis Lam
2022-10-10 02:28:03 +08:00
parent a36f24d827
commit a577fba848
6 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/client.js
View File

@@ -4,7 +4,8 @@
const { TimeLogger } = require("../src/util");
const { R } = require("redbean-node");
const { UptimeKumaServer } = require("./uptime-kuma-server");
const io = UptimeKumaServer.getInstance().io;
const server = UptimeKumaServer.getInstance();
const io = server.io;
const { setting } = require("./util-server");
const checkVersion = require("./check-version");
@@ -121,7 +122,8 @@ async function sendInfo(socket) {
socket.emit("info", {
version: checkVersion.version,
latestVersion: checkVersion.latestVersion,
primaryBaseURL: await setting("primaryBaseURL")
primaryBaseURL: await setting("primaryBaseURL"),
serverTimezone: await server.getTimezone(),
});
}

10
server/model/maintenance.js
View File

@@ -1,5 +1,5 @@
const { BeanModel } = require("redbean-node/dist/bean-model");
const { parseTimeObject, parseTimeFromTimeObject, isoToUTCDateTime, utcToISODateTime } = require("../../src/util");
const { parseTimeObject, parseTimeFromTimeObject, isoToUTCDateTime, utcToISODateTime, SQL_DATETIME_FORMAT, utcToLocal, localToUTC } = require("../../src/util");
const { isArray } = require("chart.js/helpers");
const { timeObjectToUTC, timeObjectToLocal } = require("../util-server");
@@ -15,9 +15,9 @@ class Maintenance extends BeanModel {
let dateRange = [];
if (this.start_date) {
dateRange.push(utcToISODateTime(this.start_date));
dateRange.push(utcToLocal(this.start_date));
if (this.end_date) {
dateRange.push(utcToISODateTime(this.end_date));
dateRange.push(utcToLocal(this.end_date));
}
}
@@ -92,10 +92,10 @@ class Maintenance extends BeanModel {
bean.active = obj.active;
if (obj.dateRange[0]) {
bean.start_date = isoToUTCDateTime(obj.dateRange[0]);
bean.start_date = localToUTC(obj.dateRange[0]);
if (obj.dateRange[1]) {
bean.end_date = isoToUTCDateTime(obj.dateRange[1]);
bean.end_date = localToUTC(obj.dateRange[1]);
}
}