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

cleaning

Browse Source
This commit is contained in:
les
2020-11-06 11:05:05 +01:00
parent 0ac2edf69d
commit 47ed677362
10 changed files with 161 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/federation/helpers.js
View File

@@ -78,17 +78,19 @@ const Helpers = {
const body = {
id: `${config.baseurl}/federation/m/${event.id}#create`,
type,
to: recipients[sharedInbox],
cc: ['https://www.w3.org/ns/activitystreams#Public', `${config.baseurl}/federation/u/${settingsController.settings.instance_name}/followers`],
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.toAP(settingsController.settings.instance_name,
object: event.toAPNote(settingsController.settings.instance_name,
settingsController.settings.instance_locale,
recipients[sharedInbox])
}
body['@context'] = [
'https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1',
{ Hashtag: 'as:Hashtag' }]
{
Hashtag: 'as:Hashtag'
}]
Helpers.signAndSend(body, sharedInbox)
}
},

2
server/federation/index.js
View File

@@ -37,7 +37,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.toAP(event.user.username, req.settings.locale))
return res.json(event.toAPNote(event.user.username, req.settings.locale))
})
// get any message coming from federation

47
server/federation/users.js
View File

@@ -12,7 +12,6 @@ module.exports = {
const name = req.params.name
if (!name) { return res.status(400).send('Bad request.') }
// const user = await User.findOne({ where: { username: name } })
if (name !== req.settings.instance_name) { return res.status(404).send(`No record found for ${name}`) }
const ret = {
'@context': [
@@ -74,8 +73,8 @@ module.exports = {
id: `${config.baseurl}/federation/u/${name}/followers`,
type: 'OrderedCollection',
totalItems: followers.length,
first: `${config.baseurl}/federation/u/${name}/followers?page=true`,
last: `${config.baseurl}/federation/u/${name}/followers?page=true`,
// first: `${config.baseurl}/federation/u/${name}/followers?page=true`,
// last: `${config.baseurl}/federation/u/${name}/followers?page=true`,
orderedItems: followers.map(f => f.ap_id)
})
}
@@ -84,7 +83,7 @@ module.exports = {
id: `${config.baseurl}/federation/u/${name}/followers?page=${page}`,
type: 'OrderedCollectionPage',
totalItems: followers.length,
partOf: `${config.baseurl}/federation/u/${name}/followers`,
// partOf: `${config.baseurl}/federation/u/${name}/followers`,
orderedItems: followers.map(f => f.ap_id)
})
},
@@ -92,35 +91,41 @@ module.exports = {
async outbox (req, res) {
// TODO
const name = req.params.name
const page = req.query.page
// const page = req.query.page
if (!name) { return res.status(400).send('Bad request.') }
if (name !== req.settings.instance_name) { return res.status(404).send(`No record found for ${name}`) }
const events = await Event.findAll({ include: [{ model: Tag, required: false }, Place] })
debug('Inside outbox, should return all events from this user')
debug('Inside outbox, should return all events from this user -> ', events.length)
// https://www.w3.org/TR/activitypub/#outbox
res.type('application/activity+json; charset=utf-8')
if (!page) {
return res.json({
'@context': 'https://www.w3.org/ns/activitystreams',
id: `${config.baseurl}/federation/u/${name}/outbox`,
type: 'OrderedCollection',
totalItems: events.length,
first: `${config.baseurl}/federation/u/${name}/outbox?page=true`,
last: `${config.baseurl}/federation/u/${name}/outbox?page=true`
})
}
// if (!page) {
// return res.json({
// '@context': 'https://www.w3.org/ns/activitystreams',
// id: `${config.baseurl}/federation/u/${name}/outbox`,
// type: 'OrderedCollection',
// totalItems: events.length,
// first: `${config.baseurl}/federation/u/${name}/outbox?page=true`,
// last: `${config.baseurl}/federation/u/${name}/outbox?page=true`
// })
// }
debug('With pagination %s', page)
// debug('With pagination %s', page)
return res.json({
'@context': ['https://www.w3.org/ns/activitystreams', { Hashtag: 'as:Hashtag' }],
id: `${config.baseurl}/federation/u/${name}/outbox?page=${page}`,
'@context': [
'https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1',
{
hashtag: 'as:Hashtag'
}
],
id: `${config.baseurl}/federation/u/${name}/outbox`,
type: 'OrderedCollectionPage',
totalItems: events.length,
partOf: `${config.baseurl}/federation/u/${name}/outbox`,
// partOf: `${config.baseurl}/federation/u/${name}/outbox`,
orderedItems:
events.map(e => ({
id: `${config.baseurl}/federation/m/${e.id}#create`,
@@ -129,7 +134,7 @@ module.exports = {
cc: [`${config.baseurl}/federation/u/${name}/followers`],
published: e.createdAt,
actor: `${config.baseurl}/federation/u/${name}`,
object: e.toAP(name, req.settings.locale)
object: e.toAPNote(name, req.settings.locale)
}))
})
}