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

better SEO

Browse Source
This commit is contained in:
les
2019-09-18 12:55:33 +02:00
parent bb968ffe90
commit d264ca4973
6 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/federation/comments.js
View File

@@ -8,8 +8,6 @@ module.exports = {
// search for related event
const inReplyTo = body.object.inReplyTo
const match = inReplyTo.match('.*\/federation\/m\/(.*)')
console.error('inReplyTo', inReplyTo)
console.error('match', match)
if (!match || match.length < 2) {
debug('Comment not found %s', inReplyTo)
return res.status(404).send('Event not found!')

10
server/federation/follows.js
View File

@@ -14,10 +14,10 @@ module.exports = {
if (!user) { return res.status(404).send('User not found') }
// check for duplicate
if (!user.fed_users.includes(body.actor)) {
await user.addFed_users([req.fedi_user.id])
if (!user.followers.includes(body.actor)) {
await user.addFollowers([req.fedi_user.id])
// await user.update({ followers: [...user.followers, body.actor] })
debug('%s followed by %s (%d)', username, body.actor, user.fed_users.length+1)
debug('%s followed by %s (%d)', username, body.actor, user.followers.length+1)
} else {
debug('duplicate %s followed by %s', username, body.actor)
}
@@ -37,7 +37,7 @@ module.exports = {
async unfollow (req, res) {
const body = req.body
const username = body.object.object.replace(`${config.baseurl}/federation/u/`, '')
const user = await User.findOne({ where: { username } })
const user = await User.findOne({ where: { username }, include: { model: FedUsers, as: 'followers'} })
if (!user) { return res.status(404).send('User not found') }
if (body.actor !== body.object.actor || body.actor !== req.fedi_user.id) {
@@ -45,7 +45,7 @@ module.exports = {
return res.status(400).send('Bad things')
}
if (req.fedi_user) await user.removeFed_users(req.fedi_user.id)
if (req.fedi_user) await user.removeFollowers(req.fedi_user.id)
debug('%s unfollowed by %s', username, body.actor)
res.sendStatus(200)
}

37
server/federation/helpers.js
View File

@@ -15,6 +15,8 @@ const Helpers = {
const urlToIgnore = [
'/api/v1/instance',
'/api/meta',
'/api/statusnet/version.json',
'/api/gnusocial/version.json',
'/api/statusnet/config.json',
'/poco',
]
@@ -31,7 +33,7 @@ const Helpers = {
const signer = crypto.createSign('sha256')
const d = new Date()
const stringToSign = `(request-target): post ${toUrl.path}\nhost: ${toUrl.hostname}\ndate: ${d.toUTCString()}`
debug('Sign and send', user.username, to)
signer.update(stringToSign)
signer.end()
const signature = signer.sign(privkey)
@@ -52,13 +54,10 @@ const Helpers = {
async sendEvent (event, user) {
if (!settings.settings.enable_federation) {
console.error(settings.settings)
console.error(settings.secretSettings)
debug('federation disabled')
debug('event not send, federation disabled')
return
}
console.error('dentro sendEvent ', user)
// event is sent by user that published it and by the admin instance
// collect followers from admin and user
@@ -68,23 +67,24 @@ const Helpers = {
return
}
console.error(instanceAdmin.followers)
let recipients = {}
instanceAdmin.followers.forEach(follower => {
const sharedInbox = follower.user_followers.endpoints.sharedInbox
const sharedInbox = follower.object.endpoints.sharedInbox
if (!recipients[sharedInbox]) recipients[sharedInbox] = []
recipients[sharedInbox].push(follower.id)
recipients[sharedInbox].push(follower.ap_id)
})
for(const sharedInbox in recipients) {
debug('Notify %s with event %s (from admin user %s) cc => %d', sharedInbox, event.title, instanceAdmin.username, recipients[sharedInbox].length)
debug('Notify %s with event %s (from admin %s) cc => %d', sharedInbox, event.title, instanceAdmin.username, recipients[sharedInbox].length)
const body = {
id: `${config.baseurl}/federation/m/${event.id}#create`,
type: 'Create',
to: ['https://www.w3.org/ns/activitystreams#Public'],
cc: [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, ...recipients[sharedInbox]],
// cc: [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, ...recipients[sharedInbox]],
cc: recipients[sharedInbox],
actor: `${config.baseurl}/federation/u/${instanceAdmin.username}`,
object: event.toAP(instanceAdmin.username, [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, ...recipients[sharedInbox]])
// object: event.toAP(instanceAdmin.username, [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, ...recipients[sharedInbox]])
object: event.toAP(instanceAdmin.username, recipients[sharedInbox])
}
body['@context'] = 'https://www.w3.org/ns/activitystreams'
Helpers.signAndSend(body, instanceAdmin, sharedInbox)
@@ -100,24 +100,27 @@ const Helpers = {
return
}
debug('Sending to user followers => ', user.username)
user = await User.findByPk( user.id, { include: { model: FedUsers, as: 'followers' }})
debug('Sending to user followers => ', user.followers.length)
recipients = {}
user.followers.forEach(follower => {
const sharedInbox = follower.object.endpoints.sharedInbox
if (!recipients[sharedInbox]) recipients[sharedInbox] = []
recipients[sharedInbox].push(follower.id)
recipients[sharedInbox].push(follower.ap_id)
})
debug(recipients)
for(const sharedInbox in recipients) {
debug('Notify %s with event %s (from admin user %s) cc => %d', sharedInbox, event.title, user.username, recipients[sharedInbox].length)
debug('Notify %s with event %s (from user %s) cc => %d', sharedInbox, event.title, user.username, recipients[sharedInbox].length)
const body = {
id: `${config.baseurl}/federation/m/${event.id}#create`,
type: 'Create',
to: ['https://www.w3.org/ns/activitystreams#Public'],
cc: [`${config.baseurl}/federation/u/${user.username}/followers`, ...recipients[sharedInbox]],
// cc: [`${config.baseurl}/federation/u/${user.username}/followers`, ...recipients[sharedInbox]],
cc: recipients[sharedInbox],
actor: `${config.baseurl}/federation/u/${user.username}`,
object: event.toAP(user.username, [`${config.baseurl}/federation/u/${user.username}/followers`, ...recipients[sharedInbox]])
// object: event.toAP(user.username, [`${config.baseurl}/federation/u/${user.username}/followers`, ...recipients[sharedInbox]])
object: event.toAP(user.username, recipients[sharedInbox])
}
body['@context'] = 'https://www.w3.org/ns/activitystreams'
Helpers.signAndSend(body, user, sharedInbox)