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

remove repeated redirect_on_html_accepted on fedi url

Browse Source
This commit is contained in:
lesion
2021-11-11 16:43:41 +01:00
parent 23cd8c92da
commit adcdbc790d
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/federation/index.js
View File

@@ -7,7 +7,6 @@ const User = require('../api/models/user')
const Tag = require('../api/models/tag') const Tag = require('../api/models/tag')
const Place = require('../api/models/place') const Place = require('../api/models/place')
const settingsController = require('../api/controller/settings')
const Helpers = require('./helpers') const Helpers = require('./helpers')
const Inbox = require('./inbox') const Inbox = require('./inbox')
const log = require('../log') const log = require('../log')
@@ -21,6 +20,7 @@ router.use(cors())
// is federation enabled? middleware // is federation enabled? middleware
router.use((req, res, next) => { router.use((req, res, next) => {
const settingsController = require('../api/controller/settings')
if (settingsController.settings.enable_federation) { return next() } if (settingsController.settings.enable_federation) { return next() }
log.debug('Federation disabled!') log.debug('Federation disabled!')
return res.status(401).send('Federation disabled') return res.status(401).send('Federation disabled')
@@ -29,6 +29,7 @@ router.use((req, res, next) => {
router.use(express.json({ type: ['application/json', 'application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'] })) router.use(express.json({ type: ['application/json', 'application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'] }))
router.get('/m/:event_id', async (req, res) => { router.get('/m/:event_id', async (req, res) => {
const settingsController = require('../api/controller/settings')
log.debug('[AP] Get event details ') log.debug('[AP] Get event details ')
const event_id = req.params.event_id const event_id = req.params.event_id
if (req.accepts('html')) { return res.redirect(301, `/event/${event_id}`) } if (req.accepts('html')) { return res.redirect(301, `/event/${event_id}`) }
@@ -41,16 +42,9 @@ router.get('/m/:event_id', async (req, res) => {
// get any message coming from federation // get any message coming from federation
router.post('/u/:name/inbox', Helpers.verifySignature, Inbox) router.post('/u/:name/inbox', Helpers.verifySignature, Inbox)
function redirect_on_html_accepted (req, res, next) {
if (req.accepts('html')) {
return res.redirect(settingsController.settings.baseurl)
}
return next()
}
router.get('/u/:name/outbox', Users.outbox) router.get('/u/:name/outbox', Users.outbox)
router.get('/u/:name/followers', Users.followers) router.get('/u/:name/followers', Users.followers)
router.get('/u/:name', redirect_on_html_accepted, Users.get) router.get('/u/:name', Users.get)
// Handle 404 // Handle 404
router.use((req, res) => { router.use((req, res) => {