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

Merge branch 'master' into feat/mediaFocalAlt

Browse Source
This commit is contained in:
les
2021-07-19 12:33:12 +02:00
parent 33f2507cba d8bf0f8ca3
commit fdd051ed86
8 changed files with 283 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/federation/follows.js
View File

@@ -10,7 +10,7 @@ module.exports = {
if (typeof body.object !== 'string') { return }
const username = body.object.replace(`${config.baseurl}/federation/u/`, '')
if (username !== req.settings.instance_name) {
log.warn(`Following the wrong user: ${username} instead of ${req.settings.instance_name}`)
log.warn(`Following the wrong user: ${username} instead of ${req.settings.instance_name} (could be a wrong config.baseurl)`)
return res.status(404).send('User not found')
}

2
server/notifier.js
View File

@@ -43,7 +43,7 @@ const notifier = {
// insert notifications
const notifications = await eventController.getNotifications(event, action)
await event.addNotifications(notifications)
const event_notifications = await event.getNotifications()
const event_notifications = await event.getNotifications({ through: { where: { status: 'new' } } })
const promises = event_notifications.map(async notification => {
try {