yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 17:59:37 +02:00
Code Issues Releases Wiki Activity

Set port if not specified in webfinger

Browse source
This commit is contained in:
Chocobozzz 2017-12-19 14:21:14 +01:00
parent d4c6a3b985
commit 0405ab52dc
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
server/helpers/utils.ts
View file

@ -2,13 +2,26 @@ import * as express from 'express'
import { Model } from 'sequelize-typescript'
import { ResultList } from '../../shared'
import { VideoResolution } from '../../shared/models/videos'
import { CONFIG } from '../initializers'
import { CONFIG, REMOTE_SCHEME } from '../initializers'
import { UserModel } from '../models/account/user'
import { ActorModel } from '../models/activitypub/actor'
import { ApplicationModel } from '../models/application/application'
import { pseudoRandomBytesPromise } from './core-utils'
import { logger } from './logger'
function getHostWithPort (host: string) {
const splitted = host.split(':')
// The port was not specified
if (splitted.length === 1) {
if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
return host + ':80'
}
return host
}
function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
return res.type('json').status(400).end()
}
@ -108,5 +121,6 @@ export {
computeResolutionsToTranscode,
resetSequelizeInstance,
getServerActor,
SortType
SortType,
getHostWithPort
}