NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-01-31 16:42:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix(AP): improve outbox collection

Browse source
This commit is contained in:
lesion 2024-01-19 00:42:16 +01:00
parent 3d3a6e7c76
commit 67b738f7f9
No known key found for this signature in database
GPG key ID: 352918250B012177
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
server/federation/users.js
View file

@ -5,6 +5,7 @@ const config = require('../config')
const log = require('../log')
const settingsController = require('../api/controller/settings')
const { DateTime } = require('luxon')
const Helpers = require('./helpers')
module.exports = {
get (req, res) {
@ -30,17 +31,6 @@ module.exports = {
// https://docs.joinmastodon.org/spec/activitypub/#discoverable
"discoverable": "toot:discoverable",
// https://docs.joinmastodon.org/spec/activitypub/#Hashtag
"Hashtag": "https://www.w3.org/ns/activitystreams#Hashtag",
manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
// focal point - https://docs.joinmastodon.org/spec/activitypub/#focalPoint
"focalPoint": {
"@container": "@list",
"@id": "toot:focalPoint"
}
}
],
id: `${config.baseurl}/federation/u/${name}`,
@ -129,11 +119,11 @@ module.exports = {
return res.status(400).send('Bad request.')
}
if (name !== settings.instance_name) {
log.info(`[FEDI] No record found for ${name} (instance name is ${settings.instance_name})`)
log.info(`[FEDI] No record found for ${name} (applicationActor is ${settings.instance_name})`)
return res.status(404).send(`No record found for ${escape(name)}`)
}
const n_events = await Event.count({ where: { is_visible: true }}) // should hide events from the fedi?
const n_events = await Event.count({ where: { is_visible: true, ap_id: null }})
let events = []
log.debug(`[FEDI] GET /outbox, should return all events from this instance: ${n_events}`)
// https://www.w3.org/TR/activitypub/#outbox
@ -142,12 +132,18 @@ module.exports = {
const last_page = Math.ceil(n_events/10)
if (page) {
events = await Event.findAll({ where: { is_visible: true }, include: [{ model: Tag, required: false }, Place], limit: events_per_page, offset: (page-1)*events_per_page })
events = await Event.findAll({
where: { is_visible: true, ap_id: null },
include: [{ model: Tag, required: false }, Place],
limit: events_per_page,
offset: (page-1)*events_per_page,
order: [['start_datetime', 'DESC']],
})
return res.json({
'@context': 'https://www.w3.org/ns/activitystreams',
'@context': Helpers['@context'],
id: `${config.baseurl}/federation/u/${name}/outbox?page=${page}`,
type: 'OrderedCollectionPage',
totalItems: events.length,
totalItems: n_events,
partOf: `${config.baseurl}/federation/u/${name}/outbox`,
...( page > 1 && { prev: `${config.baseurl}/federation/u/${name}/outbox?page=${page-1}`}),
...( page !== last_page && { next: `${config.baseurl}/federation/u/${name}/outbox?page=${page+1}`}),