From da854ddd502cd70685ef779c673b9e63757b8aa0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Dec 2017 11:16:08 +0100 Subject: Propagate old comment on new follow --- server/initializers/checker.ts | 2 +- server/initializers/installer.ts | 3 ++- server/initializers/migrations/0135-video-channel-actor.ts | 2 +- server/initializers/migrator.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts index 7e76990b5..45647ab1d 100644 --- a/server/initializers/checker.ts +++ b/server/initializers/checker.ts @@ -1,5 +1,5 @@ import * as config from 'config' -import { promisify0 } from '../helpers' +import { promisify0 } from '../helpers/core-utils' import { UserModel } from '../models/account/user' import { ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index ee3c9dfd9..58713c2c4 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -1,6 +1,7 @@ import * as passwordGenerator from 'password-generator' import { UserRole } from '../../shared' -import { logger, mkdirpPromise, rimrafPromise } from '../helpers' +import { mkdirpPromise, rimrafPromise } from '../helpers/core-utils' +import { logger } from '../helpers/logger' import { createApplicationActor, createUserAccountAndChannel } from '../lib/user' import { UserModel } from '../models/account/user' import { ApplicationModel } from '../models/application/application' diff --git a/server/initializers/migrations/0135-video-channel-actor.ts b/server/initializers/migrations/0135-video-channel-actor.ts index 9b5acb338..033f43b68 100644 --- a/server/initializers/migrations/0135-video-channel-actor.ts +++ b/server/initializers/migrations/0135-video-channel-actor.ts @@ -1,6 +1,6 @@ import * as Sequelize from 'sequelize' import { DataType } from 'sequelize-typescript' -import { createPrivateAndPublicKeys } from '../../helpers' +import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto' async function up (utils: { transaction: Sequelize.Transaction, diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts index bb2539fc8..29310b913 100644 --- a/server/initializers/migrator.ts +++ b/server/initializers/migrator.ts @@ -1,5 +1,6 @@ import * as path from 'path' -import { logger, readdirPromise } from '../helpers' +import { readdirPromise } from '../helpers/core-utils' +import { logger } from '../helpers/logger' import { LAST_MIGRATION_VERSION } from './constants' import { sequelizeTypescript } from './database' -- cgit v1.2.3