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

use local instance timezone everywhere #151

Browse Source
This commit is contained in:
lesion
2022-04-27 11:58:58 +02:00
parent 6776b1b1b1
commit 35e44a8a80
7 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
const config = require('../../config')
const moment = require('dayjs')
const { htmlToText } = require('html-to-text')
const { Model, DataTypes } = require('sequelize')
@@ -14,9 +13,12 @@ const Place = require('./place')
const User = require('./user')
const Tag = require('./tag')
const utc = require('dayjs/plugin/utc')
const dayjs = require('dayjs')
const timezone = require('dayjs/plugin/timezone')
const utc = require('dayjs/plugin/utc')
dayjs.extend(utc)
dayjs.extend(timezone)
class Event extends Model {}
@@ -76,7 +78,7 @@ Event.prototype.toAP = function (username, locale, to = []) {
const plainDescription = htmlToText(this.description && this.description.replace('\n', '').slice(0, 1000))
const content = `
📍 ${this.place && this.place.name}
📅 ${moment.unix(this.start_datetime).locale(locale).format('dddd, D MMMM (HH:mm)')}
📅 ${dayjs.unix(this.start_datetime).tz().locale(locale).format('dddd, D MMMM (HH:mm)')}
${plainDescription}
`
@@ -99,8 +101,8 @@ Event.prototype.toAP = function (username, locale, to = []) {
name: this.title,
url: `${config.baseurl}/event/${this.slug || this.id}`,
type: 'Event',
startTime: moment.unix(this.start_datetime).locale(locale).format(),
endTime: this.end_datetime ? moment.unix(this.end_datetime).locale(locale).format() : null,
startTime: dayjs.unix(this.start_datetime).tz().locale(locale).format(),
endTime: this.end_datetime ? dayjs.unix(this.end_datetime).tz().locale(locale).format() : null,
location: {
name: this.place.name,
address: this.place.address