diff --git a/server/api/models/event.js b/server/api/models/event.js index d25c2c00..46a29369 100644 --- a/server/api/models/event.js +++ b/server/api/models/event.js @@ -71,7 +71,7 @@ Event.belongsTo(Event, { as: 'parent' }) SequelizeSlugify.slugifyModel(Event, { source: ['title'], overwrite: false }) -Event.prototype.toAPNote = function (username, locale, to = []) { +Event.prototype.toAP = function (username, locale, to = []) { const tags = this.tags && this.tags.map(t => t.tag.replace(/[ #]/g, '_')) const plainDescription = htmlToText(this.description && this.description.replace('\n', '').slice(0, 1000)) const content = ` diff --git a/server/federation/helpers.js b/server/federation/helpers.js index 6940ec31..b9a0392d 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -89,7 +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.toAPNote(settingsController.settings.instance_name, + object: event.toAP(settingsController.settings.instance_name, settingsController.settings.instance_locale, recipients[sharedInbox]) } diff --git a/server/federation/index.js b/server/federation/index.js index f47cec1c..927c78e7 100644 --- a/server/federation/index.js +++ b/server/federation/index.js @@ -35,7 +35,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') } - return res.json(event.toAPNote(settingsController.settings.instance_name, req.settings.instance_locale)) + return res.json(event.toAP(settingsController.settings.instance_name, req.settings.instance_locale)) }) // get any message coming from federation diff --git a/server/federation/users.js b/server/federation/users.js index 013fac88..09540f91 100644 --- a/server/federation/users.js +++ b/server/federation/users.js @@ -132,7 +132,7 @@ module.exports = { cc: [`${config.baseurl}/federation/u/${name}/followers`], published: dayjs(e.createdAt).utc().format(), actor: `${config.baseurl}/federation/u/${name}`, - object: e.toAPNote(name, req.settings.instance_locale) + object: e.toAP(name, req.settings.instance_locale) })) } }) @@ -160,7 +160,7 @@ module.exports = { // cc: [`${config.baseurl}/federation/u/${name}/followers`], // published: dayjs(e.createdAt).utc().format(), // actor: `${config.baseurl}/federation/u/${name}`, -// object: e.toAPNote(name, req.settings.locale) +// object: e.toAP(name, req.settings.locale) // })) // }) // }