5 files changed, 20 insertions, 18 deletions

diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 55a7df661..5210f9fe4 100644
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -23,6 +23,7 @@ import {
 import {
   PodInstance
 } from '../../models'
+import { Pod as FormatedPod } from '../../../shared'
 
 const podsRouter = express.Router()
 
@@ -72,7 +73,7 @@ function addPods (req: express.Request, res: express.Response, next: express.Nex
 
 function listPods (req: express.Request, res: express.Response, next: express.NextFunction) {
   db.Pod.list()
-    .then(podsList => res.json(getFormatedObjects(podsList, podsList.length)))
+    .then(podsList => res.json(getFormatedObjects<FormatedPod, PodInstance>(podsList, podsList.length)))
     .catch(err => next(err))
 }
 
diff --git a/server/lib/friends.ts b/server/lib/friends.ts
index 4d56e9eb2..a65820191 100644
--- a/server/lib/friends.ts
+++ b/server/lib/friends.ts
@@ -38,7 +38,9 @@ import {
   RemoteVideoCreateData,
   RemoteVideoUpdateData,
   RemoteVideoRemoveData,
-  RemoteVideoReportAbuseData
+  RemoteVideoReportAbuseData,
+  ResultList,
+  Pod as FormatedPod
 } from '../../shared'
 
 type QaduParam = { videoId: string, type: RequestVideoQaduType }
@@ -268,8 +270,8 @@ export {
 
 function computeForeignPodsList (host: string, podsScore: { [ host: string ]: number }) {
   // TODO: type res
-  return getForeignPodsList(host).then((res: any) => {
-    const foreignPodsList = res.data
+  return getForeignPodsList(host).then(res => {
+    const foreignPodsList: { host: string }[] = res.data
 
     // Let's give 1 point to the pod we ask the friends list
     foreignPodsList.push({ host })
@@ -302,7 +304,7 @@ function computeWinningPods (hosts: string[], podsScore: { [ host: string ]: num
 }
 
 function getForeignPodsList (host: string) {
-  return new Promise((res, rej) => {
+  return new Promise< ResultList<FormatedPod> >((res, rej) => {
     const path = '/api/' + API_VERSION + '/pods'
 
     request.get(REMOTE_SCHEME.HTTP + '://' + host + path, function (err, response, body) {
diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index f34c9c667..2d7e56756 100644
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -68,11 +68,10 @@ function saveToken (token: TokenInfo, client: OAuthClientInstance, user: UserIns
     userId: user.id
   }
 
-  return db.OAuthToken.create(tokenToCreate).then(function (tokenCreated: any) {
-    tokenCreated.client = client
-    tokenCreated.user = user
+  return db.OAuthToken.create(tokenToCreate).then(tokenCreated => {
+    const tokenToReturn = Object.assign(tokenCreated, { client, user })
 
-    return tokenCreated
+    return tokenToReturn
   })
 }
 
diff --git a/server/models/video/tag.ts b/server/models/video/tag.ts
index d0d8353d7..2992da56d 100644
--- a/server/models/video/tag.ts
+++ b/server/models/video/tag.ts
@@ -54,7 +54,7 @@ function associate (models) {
 findOrCreateTags = function (tags: string[], transaction: Sequelize.Transaction) {
   const tasks: Promise<TagInstance>[] = []
   tags.forEach(tag => {
-    const query: any = {
+    const query: Sequelize.FindOrInitializeOptions<TagAttributes> = {
       where: {
         name: tag
       },
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 47d3cad1d..496385b35 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -696,23 +696,23 @@ loadAndPopulateAuthorAndPodAndTags = function (id: string) {
 }
 
 searchAndPopulateAuthorAndPodAndTags = function (value: string, field: string, start: number, count: number, sort: string) {
-  const podInclude: any = {
+  const podInclude: Sequelize.IncludeOptions = {
     model: Video['sequelize'].models.Pod,
     required: false
   }
 
-  const authorInclude: any = {
+  const authorInclude: Sequelize.IncludeOptions = {
     model: Video['sequelize'].models.Author,
     include: [
       podInclude
     ]
   }
 
-  const tagInclude: any = {
+  const tagInclude: Sequelize.IncludeOptions = {
     model: Video['sequelize'].models.Tag
   }
 
-  const query: any = {
+  const query: Sequelize.FindOptions = {
     distinct: true,
     where: createBaseVideosWhere(),
     offset: start,
@@ -723,10 +723,10 @@ searchAndPopulateAuthorAndPodAndTags = function (value: string, field: string, s
   // Make an exact search with the magnet
   if (field === 'magnetUri') {
     const infoHash = magnetUtil.decode(value).infoHash
-    query.where.infoHash = infoHash
+    query.where['infoHash'] = infoHash
   } else if (field === 'tags') {
     const escapedValue = Video['sequelize'].escape('%' + value + '%')
-    query.where.id.$in = Video['sequelize'].literal(
+    query.where['id'].$in = Video['sequelize'].literal(
       `(SELECT "VideoTags"."videoId"
         FROM "Tags"
         INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
@@ -830,14 +830,14 @@ function createThumbnail (video: VideoInstance, videoPath: string) {
 }
 
 function generateImage (video: VideoInstance, videoPath: string, folder: string, imageName: string, size: string) {
-  const options: any = {
+  const options = {
     filename: imageName,
     count: 1,
     folder
   }
 
   if (size) {
-    options.size = size
+    options['size'] = size
   }
 
   return new Promise<string>((res, rej) => {