encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set ics timezone, fix #258

Browse Source
This commit is contained in:
lesion
2023-04-13 21:48:23 +02:00
parent 52bbf549d0
commit 71d45b36e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/controller/export.js
View File

@@ -97,7 +97,7 @@ const exportController = {
const settings = res.locals.settings const settings = res.locals.settings
const eventsMap = events.map(e => { const eventsMap = events.map(e => {
const tmpStart = DateTime.fromSeconds(e.start_datetime) const tmpStart = DateTime.fromSeconds(e.start_datetime, { zone: settings.instance_timezone })
const start = [ tmpStart.year, tmpStart.month, tmpStart.day, tmpStart.hour, tmpStart.minute ] const start = [ tmpStart.year, tmpStart.month, tmpStart.day, tmpStart.hour, tmpStart.minute ]
const ret = { const ret = {
@@ -114,7 +114,7 @@ const exportController = {
} }
if (e.end_datetime) { if (e.end_datetime) {
const tmpEnd = DateTime.fromSeconds(e.end_datetime) const tmpEnd = DateTime.fromSeconds(e.end_datetime, { zone: settings.instance_timezone })
const end = [ tmpEnd.year, tmpEnd.month, tmpEnd.day, tmpEnd.hour, tmpEnd.minute ] const end = [ tmpEnd.year, tmpEnd.month, tmpEnd.day, tmpEnd.hour, tmpEnd.minute ]
ret.end = end ret.end = end
} }

2
server/api/models/event.js
View File

@@ -46,7 +46,7 @@ module.exports = (sequelize, DataTypes) => {
const plainDescription = htmlToText(this.description && this.description.replace('\n', '').slice(0, 1000)) const plainDescription = htmlToText(this.description && this.description.replace('\n', '').slice(0, 1000))
const content = ` const content = `
📍 ${this.place && this.place.name} 📍 ${this.place && this.place.name}
📅 ${DateTime.fromSeconds(this.start_datetime).toFormat('EEEE, d MMMM (HH:mm)')} 📅 ${DateTime.fromSeconds(this.start_datetime, opt).toFormat('EEEE, d MMMM (HH:mm)')}
${plainDescription} ${plainDescription}
` `