Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/handlers/request-handlers/root-request-handler.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NextFunction, Request, Response } from 'express'
import accepts from 'accepts'
import { path } from 'ramda'

import { createSettings } from '../../factories/settings-factory'
Expand All @@ -9,7 +10,7 @@ import packageJson from '../../../package.json'
export const rootRequestHandler = (request: Request, response: Response, next: NextFunction) => {
const settings = createSettings()

if (request.header('accept') === 'application/nostr+json') {
if (accepts(request).type(['application/nostr+json'])) {
const {
info: { name, description, pubkey: rawPubkey, contact, relay_url },
} = settings
Expand Down
8 changes: 8 additions & 0 deletions src/routes/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import express from 'express'
import accepts from 'accepts'

Check failure on line 2 in src/routes/index.ts

View workflow job for this annotation

GitHub Actions / Lint code

Imports should be sorted alphabetically

import { nodeinfo21Handler, nodeinfoHandler } from '../handlers/request-handlers/nodeinfo-handler'
import admissionRouter from './admissions'
Expand All @@ -11,6 +12,13 @@

const router = express.Router()

router.use((req, res, next) => {
if (req.method === 'GET' && accepts(req).type(['application/nostr+json'])) {
return rootRequestHandler(req, res, next)
}
next()
})

router.get('/', rootRequestHandler)
router.get('/healthz', getHealthRequestHandler)
router.get('/terms', getTermsRequestHandler)
Expand Down
Loading