aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers/utils.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2017-12-19 14:21:14 +0100
committerChocobozzz <me@florianbigard.com>2017-12-19 14:21:14 +0100
commit0405ab52dc0f445b88f8de76e30d6e6719196023 (patch)
tree85bb741791296ba1ede1efccd8d22f9f71169dc7 /server/helpers/utils.ts
parentd4c6a3b985ea56f730d11fb1c5f04a4fdc86e4dc (diff)
downloadPeerTube-0405ab52dc0f445b88f8de76e30d6e6719196023.tar.gz
PeerTube-0405ab52dc0f445b88f8de76e30d6e6719196023.tar.zst
PeerTube-0405ab52dc0f445b88f8de76e30d6e6719196023.zip
Set port if not specified in webfinger
Diffstat (limited to 'server/helpers/utils.ts')
-rw-r--r--server/helpers/utils.ts18
1 files changed, 16 insertions, 2 deletions
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index ef6a878cf..769aa83c6 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -2,13 +2,26 @@ import * as express from 'express'
2import { Model } from 'sequelize-typescript' 2import { Model } from 'sequelize-typescript'
3import { ResultList } from '../../shared' 3import { ResultList } from '../../shared'
4import { VideoResolution } from '../../shared/models/videos' 4import { VideoResolution } from '../../shared/models/videos'
5import { CONFIG } from '../initializers' 5import { CONFIG, REMOTE_SCHEME } from '../initializers'
6import { UserModel } from '../models/account/user' 6import { UserModel } from '../models/account/user'
7import { ActorModel } from '../models/activitypub/actor' 7import { ActorModel } from '../models/activitypub/actor'
8import { ApplicationModel } from '../models/application/application' 8import { ApplicationModel } from '../models/application/application'
9import { pseudoRandomBytesPromise } from './core-utils' 9import { pseudoRandomBytesPromise } from './core-utils'
10import { logger } from './logger' 10import { logger } from './logger'
11 11
12function getHostWithPort (host: string) {
13 const splitted = host.split(':')
14
15 // The port was not specified
16 if (splitted.length === 1) {
17 if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
18
19 return host + ':80'
20 }
21
22 return host
23}
24
12function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { 25function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
13 return res.type('json').status(400).end() 26 return res.type('json').status(400).end()
14} 27}
@@ -108,5 +121,6 @@ export {
108 computeResolutionsToTranscode, 121 computeResolutionsToTranscode,
109 resetSequelizeInstance, 122 resetSequelizeInstance,
110 getServerActor, 123 getServerActor,
111 SortType 124 SortType,
125 getHostWithPort
112} 126}