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/controllers/api/users.ts | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'server/controllers/api/users.ts') diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 3106df9b9..75393ad17 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,26 +1,14 @@ import * as express from 'express' import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared' -import { getFormattedObjects, logger, retryTransactionWrapper } from '../../helpers' +import { retryTransactionWrapper } from '../../helpers/database-utils' +import { logger } from '../../helpers/logger' +import { getFormattedObjects } from '../../helpers/utils' import { CONFIG } from '../../initializers' import { createUserAccountAndChannel } from '../../lib/user' import { - asyncMiddleware, - authenticate, - ensureUserHasRight, - ensureUserRegistrationAllowed, - paginationValidator, - setPagination, - setUsersSort, - setVideosSort, - token, - usersAddValidator, - usersGetValidator, - usersRegisterValidator, - usersRemoveValidator, - usersSortValidator, - usersUpdateMeValidator, - usersUpdateValidator, - usersVideoRatingValidator + asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setPagination, setUsersSort, + setVideosSort, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, + usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator } from '../../middlewares' import { videosSortValidator } from '../../middlewares/validators' import { AccountVideoRateModel } from '../../models/account/account-video-rate' -- cgit v1.2.3