aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/custom-validators/pods.ts4
-rw-r--r--server/helpers/custom-validators/users.ts4
-rw-r--r--server/helpers/custom-validators/videos.ts4
-rw-r--r--server/helpers/database-utils.ts2
-rw-r--r--server/helpers/logger.ts6
-rw-r--r--server/helpers/peertube-crypto.ts8
-rw-r--r--server/helpers/requests.ts4
7 files changed, 13 insertions, 19 deletions
diff --git a/server/helpers/custom-validators/pods.ts b/server/helpers/custom-validators/pods.ts
index e4c827feb..ee939ad04 100644
--- a/server/helpers/custom-validators/pods.ts
+++ b/server/helpers/custom-validators/pods.ts
@@ -1,6 +1,4 @@
1import expressValidator = require('express-validator') 1import * as validator from 'validator'
2// TODO: use .validator when express-validator typing will have validator field
3const validator = expressValidator['validator']
4 2
5import { isArray } from './misc' 3import { isArray } from './misc'
6 4
diff --git a/server/helpers/custom-validators/users.ts b/server/helpers/custom-validators/users.ts
index 8fd2dac4f..f303ab8db 100644
--- a/server/helpers/custom-validators/users.ts
+++ b/server/helpers/custom-validators/users.ts
@@ -1,7 +1,5 @@
1import { values } from 'lodash' 1import { values } from 'lodash'
2import expressValidator = require('express-validator') 2import * as validator from 'validator'
3// TODO: use .validator when express-validator typing will have validator field
4const validator = expressValidator['validator']
5 3
6import { CONSTRAINTS_FIELDS, USER_ROLES } from '../../initializers' 4import { CONSTRAINTS_FIELDS, USER_ROLES } from '../../initializers'
7const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS 5const USERS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.USERS
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 2b2370be4..6389998e1 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,7 +1,5 @@
1import { values } from 'lodash' 1import { values } from 'lodash'
2import expressValidator = require('express-validator') 2import * as validator from 'validator'
3// TODO: use .validator when express-validator typing will have validator field
4const validator = expressValidator['validator']
5 3
6import { 4import {
7 CONSTRAINTS_FIELDS, 5 CONSTRAINTS_FIELDS,
diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index 7d6ce4ec8..4f49c5825 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,5 +1,5 @@
1// TODO: import from ES6 when retry typing file will include errorFilter function 1// TODO: import from ES6 when retry typing file will include errorFilter function
2import retry = require('async/retry') 2import * as retry from 'async/retry'
3 3
4import { database as db } from '../initializers/database' 4import { database as db } from '../initializers/database'
5import { logger } from './logger' 5import { logger } from './logger'
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 7c99db55f..d8f2f687c 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -1,7 +1,7 @@
1// Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/ 1// Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/
2import mkdirp = require('mkdirp') 2import * as mkdirp from 'mkdirp'
3import path = require('path') 3import * as path from 'path'
4import winston = require('winston') 4import * as winston from 'winston'
5 5
6// Do not use barrel (dependencies issues) 6// Do not use barrel (dependencies issues)
7import { CONFIG } from '../initializers/constants' 7import { CONFIG } from '../initializers/constants'
diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts
index a4e9672e6..feb32a4cd 100644
--- a/server/helpers/peertube-crypto.ts
+++ b/server/helpers/peertube-crypto.ts
@@ -1,7 +1,7 @@
1import crypto = require('crypto') 1import * as crypto from 'crypto'
2import bcrypt = require('bcrypt') 2import * as bcrypt from 'bcrypt'
3import fs = require('fs') 3import * as fs from 'fs'
4import openssl = require('openssl-wrapper') 4import * as openssl from 'openssl-wrapper'
5import { join } from 'path' 5import { join } from 'path'
6 6
7import { 7import {
diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index 8ded52972..48b1fd703 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,5 +1,5 @@
1import replay = require('request-replay') 1import * as replay from 'request-replay'
2import request = require('request') 2import * as request from 'request'
3 3
4import { 4import {
5 RETRY_REQUESTS, 5 RETRY_REQUESTS,