From 1ea508fc8aa1b36210b64c32f65c817a74fc26d1 Mon Sep 17 00:00:00 2001 From: lesion Date: Tue, 9 Nov 2021 13:05:34 +0100 Subject: [PATCH] minor --- server/federation/helpers.js | 4 ++-- server/federation/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/federation/helpers.js b/server/federation/helpers.js index 431f525a..6940ec31 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -127,7 +127,7 @@ const Helpers = { return res.data }) .catch(e => { - log.error(`get Actor ${URL}`, e) + log.error(`get Actor ${URL}`, String(e)) return false }) @@ -181,7 +181,7 @@ const Helpers = { let user = await Helpers.getActor(req.body.actor, instance) if (!user) { - log.info(`Actor ${req.body.actor} not found`) + log.info(`Actor ${req.body.actor} not found`) return res.status(401).send('Actor not found') } if (user.blocked) { diff --git a/server/federation/index.js b/server/federation/index.js index 83824e6b..f47cec1c 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.locale)) + return res.json(event.toAPNote(settingsController.settings.instance_name, req.settings.instance_locale)) }) // get any message coming from federation