nits
This commit is contained in:
@@ -9,6 +9,7 @@ export type ServiceConfig = {
|
|||||||
port: number
|
port: number
|
||||||
version?: string
|
version?: string
|
||||||
hostnames: string[]
|
hostnames: string[]
|
||||||
|
hostnamesSet: Set<string>
|
||||||
appHostname: string
|
appHostname: string
|
||||||
safelinkEnabled: boolean
|
safelinkEnabled: boolean
|
||||||
safelinkPdsUrl?: string
|
safelinkPdsUrl?: string
|
||||||
@@ -72,6 +73,7 @@ export const envToCfg = (env: Environment): Config => {
|
|||||||
port: env.port ?? 3000,
|
port: env.port ?? 3000,
|
||||||
version: env.version,
|
version: env.version,
|
||||||
hostnames: env.hostnames,
|
hostnames: env.hostnames,
|
||||||
|
hostnamesSet: new Set(env.hostnames),
|
||||||
appHostname: env.appHostname ?? 'bsky.app',
|
appHostname: env.appHostname ?? 'bsky.app',
|
||||||
safelinkEnabled: env.safelinkEnabled ?? false,
|
safelinkEnabled: env.safelinkEnabled ?? false,
|
||||||
safelinkPdsUrl: env.safelinkPdsUrl,
|
safelinkPdsUrl: env.safelinkPdsUrl,
|
||||||
|
|||||||
@@ -84,13 +84,15 @@ const getUrl = (ctx: AppContext, req: Request, id: string) => {
|
|||||||
return `${baseUrl}/${id}`
|
return `${baseUrl}/${id}`
|
||||||
}
|
}
|
||||||
const host = req.headers.host ?? ''
|
const host = req.headers.host ?? ''
|
||||||
const baseUrl = ctx.cfg.service.hostnames.includes(host)
|
const baseUrl = ctx.cfg.service.hostnamesSet.has(host)
|
||||||
? `https://${host}`
|
? `https://${host}`
|
||||||
: `https://${ctx.cfg.service.hostnames[0]}`
|
: `https://${ctx.cfg.service.hostnames[0]}`
|
||||||
return `${baseUrl}/${id}`
|
return `${baseUrl}/${id}`
|
||||||
}
|
}
|
||||||
|
|
||||||
const normalizedPathFromParts = (parts: string[]): string => {
|
const normalizedPathFromParts = (parts: string[]): string => {
|
||||||
|
// When given ['path1', 'path2', 'te:fg'], output should be
|
||||||
|
// /path1/path2/te:fg
|
||||||
return (
|
return (
|
||||||
'/' +
|
'/' +
|
||||||
parts
|
parts
|
||||||
|
|||||||
Reference in New Issue
Block a user