From be4b5eeb67331230920af0807371a0428d42a219 Mon Sep 17 00:00:00 2001 From: lesion Date: Thu, 20 Apr 2023 15:12:17 +0200 Subject: [PATCH] fix #258 without setting TZ env --- server/api/controller/export.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/api/controller/export.js b/server/api/controller/export.js index 310744de..20d2bbba 100644 --- a/server/api/controller/export.js +++ b/server/api/controller/export.js @@ -97,12 +97,14 @@ const exportController = { const settings = res.locals.settings const eventsMap = events.map(e => { - const tmpStart = DateTime.fromSeconds(e.start_datetime, { zone: settings.instance_timezone }) + const tmpStart = DateTime.fromSeconds(e.start_datetime, { zone: 'UTC' }) const start = [ tmpStart.year, tmpStart.month, tmpStart.day, tmpStart.hour, tmpStart.minute ] const ret = { uid: `${e.id}@${settings.hostname}`, start, + startInputType: 'utc', + endInputType: 'utc', title: `[${settings.title}] ${e.title}`, description: htmlToText(e.description), htmlContent: e.description, @@ -114,7 +116,7 @@ const exportController = { } if (e.end_datetime) { - const tmpEnd = DateTime.fromSeconds(e.end_datetime, { zone: settings.instance_timezone }) + const tmpEnd = DateTime.fromSeconds(e.end_datetime, { zone: 'UTC' }) const end = [ tmpEnd.year, tmpEnd.month, tmpEnd.day, tmpEnd.hour, tmpEnd.minute ] ret.end = end }