X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcore-utils.ts;h=b1e9af0a17a61325b7d8241814ad294498692799;hb=1a12f66d631d28a5a58ebbcd274426f2e6e5d203;hp=3f737c1d6ef94c67fd542756d78bf374ce1cef7e;hpb=ae9bbed46dbc8d9870c9feb66bbada484c1c7582;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts index 3f737c1d6..b1e9af0a1 100644 --- a/server/helpers/core-utils.ts +++ b/server/helpers/core-utils.ts @@ -11,14 +11,13 @@ import * as pem from 'pem' import { URL } from 'url' import { truncate } from 'lodash' import { exec } from 'child_process' -import { isArray } from './custom-validators/misc' const objectConverter = (oldObject: any, keyConverter: (e: string) => string, valueConverter: (e: any) => any) => { if (!oldObject || typeof oldObject !== 'object') { return valueConverter(oldObject) } - if (isArray(oldObject)) { + if (Array.isArray(oldObject)) { return oldObject.map(e => objectConverter(e, keyConverter, valueConverter)) } @@ -41,7 +40,7 @@ const timeTable = { month: 3600000 * 24 * 30 } -export function parseDuration (duration: number | string): number { +export function parseDurationToMs (duration: number | string): number { if (typeof duration === 'number') return duration if (typeof duration === 'string') { @@ -135,6 +134,10 @@ function isProdInstance () { return process.env.NODE_ENV === 'production' } +function getAppNumber () { + return process.env.NODE_APP_INSTANCE +} + function root () { // We are in /helpers/utils.js const paths = [ __dirname, '..', '..' ] @@ -257,6 +260,7 @@ const execPromise = promisify1(exec) export { isTestInstance, isProdInstance, + getAppNumber, objectConverter, root,