From 6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 11 Apr 2019 11:33:44 +0200 Subject: Move config in its own file --- server/helpers/audit-logger.ts | 2 +- server/helpers/captions-utils.ts | 2 +- server/helpers/custom-validators/video-channels.ts | 2 +- server/helpers/custom-validators/webfinger.ts | 4 ++-- server/helpers/express-utils.ts | 5 +++-- server/helpers/ffmpeg-utils.ts | 5 +++-- server/helpers/logger.ts | 2 +- server/helpers/requests.ts | 3 ++- server/helpers/signup.ts | 3 ++- server/helpers/utils.ts | 2 +- server/helpers/webfinger.ts | 4 ++-- server/helpers/webtorrent.ts | 2 +- 12 files changed, 20 insertions(+), 16 deletions(-) (limited to 'server/helpers') diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts index af37bce16..f536da439 100644 --- a/server/helpers/audit-logger.ts +++ b/server/helpers/audit-logger.ts @@ -4,11 +4,11 @@ import { diff } from 'deep-object-diff' import { chain } from 'lodash' import * as flatten from 'flat' import * as winston from 'winston' -import { CONFIG } from '../initializers' import { jsonLoggerFormat, labelFormatter } from './logger' import { User, VideoAbuse, VideoChannel, VideoDetails, VideoImport } from '../../shared' import { VideoComment } from '../../shared/models/videos/video-comment.model' import { CustomConfig } from '../../shared/models/server/custom-config.model' +import { CONFIG } from '../initializers/config' function getAuditIdFromRes (res: express.Response) { return res.locals.oauth.token.User.username diff --git a/server/helpers/captions-utils.ts b/server/helpers/captions-utils.ts index 0fb11a125..7174d4654 100644 --- a/server/helpers/captions-utils.ts +++ b/server/helpers/captions-utils.ts @@ -1,5 +1,5 @@ import { join } from 'path' -import { CONFIG } from '../initializers' +import { CONFIG } from '../initializers/config' import { VideoCaptionModel } from '../models/video/video-caption' import * as srt2vtt from 'srt-to-vtt' import { createReadStream, createWriteStream, remove, move } from 'fs-extra' diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts index fad7a9bcf..ca8d207cf 100644 --- a/server/helpers/custom-validators/video-channels.ts +++ b/server/helpers/custom-validators/video-channels.ts @@ -2,7 +2,7 @@ import * as express from 'express' import 'express-validator' import 'multer' import * as validator from 'validator' -import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers' +import { CONSTRAINTS_FIELDS } from '../../initializers' import { VideoChannelModel } from '../../models/video/video-channel' import { exists } from './misc' diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts index 80a7e4a9d..b18e43fad 100644 --- a/server/helpers/custom-validators/webfinger.ts +++ b/server/helpers/custom-validators/webfinger.ts @@ -1,4 +1,4 @@ -import { CONFIG, REMOTE_SCHEME } from '../../initializers' +import { REMOTE_SCHEME, WEBSERVER } from '../../initializers' import { sanitizeHost } from '../core-utils' import { exists } from './misc' @@ -11,7 +11,7 @@ function isWebfingerLocalResourceValid (value: string) { if (actorParts.length !== 2) return false const host = actorParts[1] - return sanitizeHost(host, REMOTE_SCHEME.HTTP) === CONFIG.WEBSERVER.HOST + return sanitizeHost(host, REMOTE_SCHEME.HTTP) === WEBSERVER.HOST } // --------------------------------------------------------------------------- diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts index fef2da313..2b574ab8e 100644 --- a/server/helpers/express-utils.ts +++ b/server/helpers/express-utils.ts @@ -1,10 +1,11 @@ import * as express from 'express' import * as multer from 'multer' -import { CONFIG, REMOTE_SCHEME } from '../initializers' +import { REMOTE_SCHEME } from '../initializers' import { logger } from './logger' import { deleteFileAsync, generateRandomString } from './utils' import { extname } from 'path' import { isArray } from './custom-validators/misc' +import { CONFIG } from '../initializers/config' function buildNSFWFilter (res?: express.Response, paramNSFW?: string) { if (paramNSFW === 'true') return true @@ -58,7 +59,7 @@ function getHostWithPort (host: string) { return host } -function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) { +function badRequest (req: express.Request, res: express.Response) { return res.type('json').status(400).end() } diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index c477e2e89..d818c459c 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -1,11 +1,12 @@ import * as ffmpeg from 'fluent-ffmpeg' import { dirname, join } from 'path' import { getTargetBitrate, VideoResolution } from '../../shared/models/videos' -import { CONFIG, FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers/constants' +import { FFMPEG_NICE, VIDEO_TRANSCODING_FPS } from '../initializers/constants' import { processImage } from './image-utils' import { logger } from './logger' import { checkFFmpegEncoders } from '../initializers/checker-before-init' -import { remove, readFile, writeFile } from 'fs-extra' +import { readFile, remove, writeFile } from 'fs-extra' +import { CONFIG } from '../initializers/config' function computeResolutionsToTranscode (videoFileHeight: number) { const resolutionsEnabled: number[] = [] diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts index f8a142718..734523b01 100644 --- a/server/helpers/logger.ts +++ b/server/helpers/logger.ts @@ -2,7 +2,7 @@ import { mkdirpSync } from 'fs-extra' import * as path from 'path' import * as winston from 'winston' -import { CONFIG } from '../initializers' +import { CONFIG } from '../initializers/config' import { omit } from 'lodash' const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 3762e4d3c..02854b164 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,10 +1,11 @@ import * as Bluebird from 'bluebird' import { createWriteStream, remove } from 'fs-extra' import * as request from 'request' -import { ACTIVITY_PUB, CONFIG } from '../initializers' +import { ACTIVITY_PUB } from '../initializers' import { processImage } from './image-utils' import { join } from 'path' import { logger } from './logger' +import { CONFIG } from '../initializers/config' function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }, diff --git a/server/helpers/signup.ts b/server/helpers/signup.ts index cdce7989d..5eb56b3cf 100644 --- a/server/helpers/signup.ts +++ b/server/helpers/signup.ts @@ -1,6 +1,7 @@ -import { CONFIG } from '../initializers' import { UserModel } from '../models/account/user' import * as ipaddr from 'ipaddr.js' +import { CONFIG } from '../initializers/config' + const isCidr = require('is-cidr') async function isSignupAllowed () { diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index cb0e823c5..94ceb15e0 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts @@ -1,5 +1,4 @@ import { ResultList } from '../../shared' -import { CONFIG } from '../initializers' import { ApplicationModel } from '../models/application/application' import { execPromise, execPromise2, pseudoRandomBytesPromise, sha256 } from './core-utils' import { logger } from './logger' @@ -7,6 +6,7 @@ import { join } from 'path' import { Instance as ParseTorrent } from 'parse-torrent' import { remove } from 'fs-extra' import * as memoizee from 'memoizee' +import { CONFIG } from '../initializers/config' function deleteFileAsync (path: string) { remove(path) diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts index 156376943..049808846 100644 --- a/server/helpers/webfinger.ts +++ b/server/helpers/webfinger.ts @@ -3,7 +3,7 @@ import { WebFingerData } from '../../shared' import { ActorModel } from '../models/activitypub/actor' import { isTestInstance } from './core-utils' import { isActivityPubUrlValid } from './custom-validators/activitypub/misc' -import { CONFIG } from '../initializers' +import { WEBSERVER } from '../initializers/constants' const webfinger = new WebFinger({ webfist_fallback: false, @@ -19,7 +19,7 @@ async function loadActorUrlOrGetFromWebfinger (uriArg: string) { const [ name, host ] = uri.split('@') let actor: ActorModel - if (host === CONFIG.WEBSERVER.HOST) { + if (host === WEBSERVER.HOST) { actor = await ActorModel.loadLocalByName(name) } else { actor = await ActorModel.loadByNameAndHost(name, host) diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index 3c9a0b96a..14dfe0d28 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -2,7 +2,7 @@ import { logger } from './logger' import { generateVideoImportTmpPath } from './utils' import * as WebTorrent from 'webtorrent' import { createWriteStream, ensureDir, remove } from 'fs-extra' -import { CONFIG } from '../initializers' +import { CONFIG } from '../initializers/config' import { dirname, join } from 'path' async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName?: string }, timeout: number) { -- cgit v1.2.3