use luxon instead of dayjs server side too
This commit is contained in:
@@ -89,9 +89,7 @@ const Helpers = {
|
||||
to: ['https://www.w3.org/ns/activitystreams#Public'],
|
||||
cc: [...recipients[sharedInbox], `${config.baseurl}/federation/u/${settingsController.settings.instance_name}/followers`],
|
||||
actor: `${config.baseurl}/federation/u/${settingsController.settings.instance_name}`,
|
||||
object: event.toAP(settingsController.settings.instance_name,
|
||||
settingsController.settings.instance_locale,
|
||||
recipients[sharedInbox])
|
||||
object: event.toAP(settingsController.settings, recipients[sharedInbox])
|
||||
}
|
||||
body['@context'] = [
|
||||
'https://www.w3.org/ns/activitystreams',
|
||||
|
||||
@@ -34,7 +34,7 @@ router.get('/m/:event_id', async (req, res) => {
|
||||
|
||||
const event = await Event.findByPk(req.params.event_id, { include: [User, Tag, Place] })
|
||||
if (!event) { return res.status(404).send('Not found') }
|
||||
const eventAp = event.toAP(settingsController.settings.instance_name, settingsController.settings.instance_locale)
|
||||
const eventAp = event.toAP(settingsController.settings)
|
||||
eventAp['@context'] = [
|
||||
"https://www.w3.org/ns/activitystreams"
|
||||
]
|
||||
|
||||
@@ -3,10 +3,8 @@ const { Event, Place, APUser, Tag } = require('../api/models/models')
|
||||
const escape = require('lodash/escape')
|
||||
const config = require('../config')
|
||||
const log = require('../log')
|
||||
const utc = require('dayjs/plugin/utc')
|
||||
const dayjs = require('dayjs')
|
||||
const settingsController = require('../api/controller/settings')
|
||||
dayjs.extend(utc)
|
||||
const { DateTime } = require('luxon')
|
||||
|
||||
module.exports = {
|
||||
get (req, res) {
|
||||
@@ -132,9 +130,9 @@ module.exports = {
|
||||
type: 'Create',
|
||||
to: ['https://www.w3.org/ns/activitystreams#Public'],
|
||||
cc: [`${settings.baseurl}/federation/u/${name}/followers`],
|
||||
published: dayjs(e.createdAt).utc().format(),
|
||||
published: e.createdAt,
|
||||
actor: `${settings.baseurl}/federation/u/${name}`,
|
||||
object: e.toAP(name, settings.instance_locale)
|
||||
object: e.toAP(settings)
|
||||
}))
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user