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

[fix] followers fedi

Browse Source
This commit is contained in:
les
2019-11-15 15:55:27 +01:00
parent 0a92fc635a
commit ba2d34e644
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/federation/follows.js
View File

@@ -15,7 +15,7 @@ module.exports = {
// check for duplicate // check for duplicate
if (!user.followers.includes(body.actor)) { if (!user.followers.includes(body.actor)) {
await user.addFollowers([req.fedi_user.id]) await user.addFollowers([req.fedi_user.ap_id])
// await user.update({ followers: [...user.followers, body.actor] }) // await user.update({ followers: [...user.followers, body.actor] })
debug('%s followed by %s (%d)', username, body.actor, user.followers.length + 1) debug('%s followed by %s (%d)', username, body.actor, user.followers.length + 1)
} else { } else {
@@ -29,7 +29,7 @@ module.exports = {
'actor': `${config.baseurl}/federation/u/${user.username}`, 'actor': `${config.baseurl}/federation/u/${user.username}`,
'object': body 'object': body
} }
Helpers.signAndSend(message, user, req.fedi_user.inbox) Helpers.signAndSend(message, user, req.fedi_user.object.inbox)
res.sendStatus(200) res.sendStatus(200)
}, },
@@ -40,12 +40,12 @@ module.exports = {
const user = await User.findOne({ where: { username }, include: { model: FedUsers, as: 'followers' } }) const user = await User.findOne({ where: { username }, include: { model: FedUsers, as: 'followers' } })
if (!user) { return res.status(404).send('User not found') } if (!user) { return res.status(404).send('User not found') }
if (body.actor !== body.object.actor || body.actor !== req.fedi_user.id) { if (body.actor !== body.object.actor || body.actor !== req.fedi_user.ap_id) {
debug('Unfollow an user created by a different actor !?!?') debug('Unfollow an user created by a different actor !?!?')
return res.status(400).send('Bad things') return res.status(400).send('Bad things')
} }
if (req.fedi_user) { await user.removeFollowers(req.fedi_user.id) } if (req.fedi_user) { await user.removeFollowers(req.fedi_user.ap_id) }
debug('%s unfollowed by %s', username, body.actor) debug('%s unfollowed by %s', username, body.actor)
res.sendStatus(200) res.sendStatus(200)
} }