aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/clients.ts2
-rw-r--r--server/controllers/api/config.ts2
-rw-r--r--server/controllers/api/index.ts2
-rw-r--r--server/controllers/api/pods.ts2
-rw-r--r--server/controllers/api/remote/index.ts2
-rw-r--r--server/controllers/api/remote/pods.ts2
-rw-r--r--server/controllers/api/remote/videos.ts2
-rw-r--r--server/controllers/api/requests.ts2
-rw-r--r--server/controllers/api/users.ts2
-rw-r--r--server/controllers/api/videos/abuse.ts4
-rw-r--r--server/controllers/api/videos/blacklist.ts2
-rw-r--r--server/controllers/api/videos/index.ts8
-rw-r--r--server/controllers/api/videos/rate.ts2
-rw-r--r--server/controllers/client.ts8
-rw-r--r--server/controllers/static.ts4
15 files changed, 22 insertions, 24 deletions
diff --git a/server/controllers/api/clients.ts b/server/controllers/api/clients.ts
index 614163c83..f6499556a 100644
--- a/server/controllers/api/clients.ts
+++ b/server/controllers/api/clients.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2 2
3import { CONFIG } from '../../initializers'; 3import { CONFIG } from '../../initializers';
4import { logger } from '../../helpers' 4import { logger } from '../../helpers'
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index 8bdde61b3..57c9398ec 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2 2
3import { CONFIG } from '../../initializers' 3import { CONFIG } from '../../initializers'
4 4
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 18bef2d3d..98004544d 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2 2
3import { badRequest } from '../../helpers' 3import { badRequest } from '../../helpers'
4 4
diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 4ff1f5d9f..a028c4ab9 100644
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import { waterfall } from 'async' 2import { waterfall } from 'async'
3 3
4import { database as db } from '../../initializers/database' 4import { database as db } from '../../initializers/database'
diff --git a/server/controllers/api/remote/index.ts b/server/controllers/api/remote/index.ts
index b11439204..d3522772b 100644
--- a/server/controllers/api/remote/index.ts
+++ b/server/controllers/api/remote/index.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2 2
3import { badRequest } from '../../../helpers' 3import { badRequest } from '../../../helpers'
4 4
diff --git a/server/controllers/api/remote/pods.ts b/server/controllers/api/remote/pods.ts
index 7a9a0c4f0..9c9d2164d 100644
--- a/server/controllers/api/remote/pods.ts
+++ b/server/controllers/api/remote/pods.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import * as waterfall from 'async/waterfall' 2import * as waterfall from 'async/waterfall'
3 3
4import { database as db } from '../../../initializers/database' 4import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/remote/videos.ts b/server/controllers/api/remote/videos.ts
index 178a21e7c..d97a3db31 100644
--- a/server/controllers/api/remote/videos.ts
+++ b/server/controllers/api/remote/videos.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import { eachSeries, waterfall } from 'async' 2import { eachSeries, waterfall } from 'async'
3 3
4import { database as db } from '../../../initializers/database' 4import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/requests.ts b/server/controllers/api/requests.ts
index 304499a4f..ff4b4ac1a 100644
--- a/server/controllers/api/requests.ts
+++ b/server/controllers/api/requests.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import { parallel } from 'async' 2import { parallel } from 'async'
3 3
4import { 4import {
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 97a744f54..44c5ec13c 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import { waterfall } from 'async' 2import { waterfall } from 'async'
3 3
4import { database as db } from '../../initializers/database' 4import { database as db } from '../../initializers/database'
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index 3dd884354..68db025b7 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -1,8 +1,8 @@
1import express = require('express') 1import * as express from 'express'
2import { waterfall } from 'async' 2import { waterfall } from 'async'
3 3
4import { database as db } from '../../../initializers/database' 4import { database as db } from '../../../initializers/database'
5import friends = require('../../../lib/friends') 5import * as friends from '../../../lib/friends'
6import { 6import {
7 logger, 7 logger,
8 getFormatedObjects, 8 getFormatedObjects,
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index fb4d57d7b..58960798b 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2 2
3import { database as db } from '../../../initializers/database' 3import { database as db } from '../../../initializers/database'
4import { logger } from '../../../helpers' 4import { logger } from '../../../helpers'
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 6eda7159b..b82b0936f 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -1,7 +1,7 @@
1import express = require('express') 1import * as express from 'express'
2import fs = require('fs') 2import * as fs from 'fs'
3import multer = require('multer') 3import * as multer from 'multer'
4import path = require('path') 4import * as path from 'path'
5import { waterfall } from 'async' 5import { waterfall } from 'async'
6 6
7import { database as db } from '../../../initializers/database' 7import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 571ff68e3..1bc575675 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -1,4 +1,4 @@
1import express = require('express') 1import * as express from 'express'
2import { waterfall } from 'async' 2import { waterfall } from 'async'
3 3
4import { database as db } from '../../../initializers/database' 4import { database as db } from '../../../initializers/database'
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index ce5608c9b..c3d28245c 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -1,10 +1,8 @@
1import { parallel } from 'async' 1import { parallel } from 'async'
2import express = require('express') 2import * as express from 'express'
3import fs = require('fs') 3import * as fs from 'fs'
4import { join } from 'path' 4import { join } from 'path'
5import expressValidator = require('express-validator') 5import * as validator from 'validator'
6// TODO: use .validator when express-validator typing will have validator field
7const validator = expressValidator['validator']
8 6
9import { database as db } from '../initializers/database' 7import { database as db } from '../initializers/database'
10import { 8import {
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 51f75c57e..e65282339 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,5 +1,5 @@
1import express = require('express') 1import * as express from 'express'
2import cors = require('cors') 2import * as cors from 'cors'
3 3
4import { 4import {
5 CONFIG, 5 CONFIG,