From e02643f32e4c97ca307f8fc5b69be79c40d70a3b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 22 May 2017 20:58:25 +0200 Subject: Type models --- server/controllers/api/clients.ts | 2 +- server/controllers/api/config.ts | 2 +- server/controllers/api/pods.ts | 6 +++--- server/controllers/api/remote/pods.ts | 4 ++-- server/controllers/api/remote/videos.ts | 2 +- server/controllers/api/users.ts | 4 ++-- server/controllers/api/videos/abuse.ts | 2 +- server/controllers/api/videos/blacklist.ts | 2 +- server/controllers/api/videos/index.ts | 2 +- server/controllers/api/videos/rate.ts | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/clients.ts b/server/controllers/api/clients.ts index 902f62995..614163c83 100644 --- a/server/controllers/api/clients.ts +++ b/server/controllers/api/clients.ts @@ -2,7 +2,7 @@ import express = require('express') import { CONFIG } from '../../initializers'; import { logger } from '../../helpers' -const db = require('../../initializers/database') +import { database as db } from '../../initializers/database' const clientsRouter = express.Router() diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 8f3fa2473..8bdde61b3 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -1,6 +1,6 @@ import express = require('express') -import { CONFIG } from '../../initializers'; +import { CONFIG } from '../../initializers' const configRouter = express.Router() diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts index 06dfd8295..4ff1f5d9f 100644 --- a/server/controllers/api/pods.ts +++ b/server/controllers/api/pods.ts @@ -1,7 +1,7 @@ import express = require('express') import { waterfall } from 'async' -const db = require('../../initializers/database') +import { database as db } from '../../initializers/database' import { CONFIG } from '../../initializers' import { logger, @@ -35,12 +35,12 @@ podsRouter.post('/makefriends', ensureIsAdmin, makeFriendsValidator, setBodyHostsPort, - makeFriends + makeFriendsController ) podsRouter.get('/quitfriends', authenticate, ensureIsAdmin, - quitFriends + quitFriendsController ) // --------------------------------------------------------------------------- diff --git a/server/controllers/api/remote/pods.ts b/server/controllers/api/remote/pods.ts index 85ef7bb42..7a9a0c4f0 100644 --- a/server/controllers/api/remote/pods.ts +++ b/server/controllers/api/remote/pods.ts @@ -1,7 +1,7 @@ import express = require('express') -import { waterfall } from 'async/waterfall' +import * as waterfall from 'async/waterfall' -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import { checkSignature, signatureValidator } from '../../../middlewares' const remotePodsRouter = express.Router() diff --git a/server/controllers/api/remote/videos.ts b/server/controllers/api/remote/videos.ts index df4ba8309..178a21e7c 100644 --- a/server/controllers/api/remote/videos.ts +++ b/server/controllers/api/remote/videos.ts @@ -1,7 +1,7 @@ import express = require('express') import { eachSeries, waterfall } from 'async' -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import { REQUEST_ENDPOINT_ACTIONS, REQUEST_ENDPOINTS, diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 981a4706a..97a744f54 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -1,7 +1,7 @@ import express = require('express') import { waterfall } from 'async' -const db = require('../../initializers/database') +import { database as db } from '../../initializers/database' import { CONFIG, USER_ROLES } from '../../initializers' import { logger, getFormatedObjects } from '../../helpers' import { @@ -114,7 +114,7 @@ function getUserVideoRating (req, res, next) { const videoId = req.params.videoId const userId = res.locals.oauth.token.User.id - db.UserVideoRate.load(userId, videoId, function (err, ratingObj) { + db.UserVideoRate.load(userId, videoId, null, function (err, ratingObj) { if (err) return next(err) const rating = ratingObj ? ratingObj.type : 'none' diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 88204120f..3dd884354 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -1,7 +1,7 @@ import express = require('express') import { waterfall } from 'async' -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import friends = require('../../../lib/friends') import { logger, diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index db6d95e73..fb4d57d7b 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts @@ -1,6 +1,6 @@ import express = require('express') -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import { logger } from '../../../helpers' import { authenticate, diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 5fbf03676..6eda7159b 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -4,7 +4,7 @@ import multer = require('multer') import path = require('path') import { waterfall } from 'async' -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import { CONFIG, REQUEST_VIDEO_QADU_TYPES, diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts index 21053792a..571ff68e3 100644 --- a/server/controllers/api/videos/rate.ts +++ b/server/controllers/api/videos/rate.ts @@ -1,7 +1,7 @@ import express = require('express') import { waterfall } from 'async' -const db = require('../../../initializers/database') +import { database as db } from '../../../initializers/database' import { logger, retryTransactionWrapper, -- cgit v1.2.3