Share models between server and client

10 files changed, 41 insertions, 12 deletions

diff --git a/server/controllers/api/clients.ts b/server/controllers/api/clients.ts
index 8c460096b..96490d04a 100644
--- a/server/controllers/api/clients.ts
+++ b/server/controllers/api/clients.ts
@@ -3,6 +3,7 @@ import * as express from 'express'
 import { CONFIG } from '../../initializers'
 import { logger } from '../../helpers'
 import { database as db } from '../../initializers/database'
+import { ClientLocal } from '../../../shared'
 
 const clientsRouter = express.Router()
 
@@ -27,10 +28,11 @@ function getLocalClient (req: express.Request, res: express.Response, next: expr
     if (err) return next(err)
     if (!client) return next(new Error('No client available.'))
 
-    res.json({
+    const json: ClientLocal = {
       client_id: client.clientId,
       client_secret: client.clientSecret
-    })
+    }
+    res.json(json)
   })
 }
 
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts
index c63981797..3e9aa77a5 100644
--- a/server/controllers/api/config.ts
+++ b/server/controllers/api/config.ts
@@ -1,6 +1,7 @@
 import * as express from 'express'
 
 import { CONFIG } from '../../initializers'
+import { ServerConfig } from '../../../shared'
 
 const configRouter = express.Router()
 
@@ -8,11 +9,12 @@ configRouter.get('/', getConfig)
 
 // Get the client credentials for the PeerTube front end
 function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) {
-  res.json({
+  const json: ServerConfig = {
     signup: {
       enabled: CONFIG.SIGNUP.ENABLED
     }
-  })
+  }
+  res.json(json)
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index ffe5881e5..1e9e65689 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -17,6 +17,7 @@ import {
   setUsersSort,
   token
 } from '../../middlewares'
+import { UserVideoRate as FormatedUserVideoRate } from '../../../shared'
 
 const usersRouter = express.Router()
 
@@ -119,10 +120,11 @@ function getUserVideoRating (req: express.Request, res: express.Response, next:
 
     const rating = ratingObj ? ratingObj.type : 'none'
 
-    res.json({
+    const json: FormatedUserVideoRate = {
       videoId,
       rating
-    })
+    }
+    res.json(json)
   })
 }
 
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 07c1b3f51..5b8d21f70 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -22,8 +22,12 @@ function createEmptyCallback () {
   }
 }
 
-function getFormatedObjects (objects: any[], objectsTotal: number) {
-  const formatedObjects = []
+interface FormatableToJSON {
+  toFormatedJSON()
+}
+
+function getFormatedObjects<U, T extends FormatableToJSON> (objects: T[], objectsTotal: number) {
+  const formatedObjects: U[] = []
 
   objects.forEach(function (object) {
     formatedObjects.push(object.toFormatedJSON())
diff --git a/server/models/user/user-interface.ts b/server/models/user/user-interface.ts
index fd98a042e..48c67678b 100644
--- a/server/models/user/user-interface.ts
+++ b/server/models/user/user-interface.ts
@@ -58,6 +58,10 @@ export interface UserInstance extends UserClass, UserAttributes, Sequelize.Insta
   id: number
   createdAt: Date
   updatedAt: Date
+
+  isPasswordMatch: UserMethods.IsPasswordMatch
+  toFormatedJSON: UserMethods.ToFormatedJSON
+  isAdmin: UserMethods.IsAdmin
 }
 
 export interface UserModel extends UserClass, Sequelize.Model<UserInstance, UserAttributes> {}
diff --git a/server/models/user/user-video-rate.ts b/server/models/user/user-video-rate.ts
index 1094eb281..4bdd35bc9 100644
--- a/server/models/user/user-video-rate.ts
+++ b/server/models/user/user-video-rate.ts
@@ -1,6 +1,5 @@
 /*
   User rates per video.
-
 */
 import { values } from 'lodash'
 import * as Sequelize from 'sequelize'
diff --git a/server/models/video/video-abuse-interface.ts b/server/models/video/video-abuse-interface.ts
index f3e32f79c..c85d09091 100644
--- a/server/models/video/video-abuse-interface.ts
+++ b/server/models/video/video-abuse-interface.ts
@@ -6,7 +6,7 @@ import { PodInstance } from '../pod'
 import { VideoAbuse as FormatedVideoAbuse } from '../../../shared/models/video-abuse.model'
 
 export namespace VideoAbuseMethods {
-  export type toFormatedJSON = () => FormatedVideoAbuse
+  export type ToFormatedJSON = (this: VideoAbuseInstance) => FormatedVideoAbuse
 
   export type ListForApiCallback = (err: Error, videoAbuseInstances?: VideoAbuseInstance[], total?: number) => void
   export type ListForApi = (start: number, count: number, sort: string, callback: ListForApiCallback) => void
@@ -28,6 +28,8 @@ export interface VideoAbuseInstance extends VideoAbuseClass, VideoAbuseAttribute
   updatedAt: Date
 
   Pod: PodInstance
+
+  toFormatedJSON: VideoAbuseMethods.ToFormatedJSON
 }
 
 export interface VideoAbuseModel extends VideoAbuseClass, Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes> {}
diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts
index f5b4debe6..bc5f01e21 100644
--- a/server/models/video/video-abuse.ts
+++ b/server/models/video/video-abuse.ts
@@ -13,6 +13,7 @@ import {
 } from './video-abuse-interface'
 
 let VideoAbuse: Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes>
+let toFormatedJSON: VideoAbuseMethods.ToFormatedJSON
 let listForApi: VideoAbuseMethods.ListForApi
 
 export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
@@ -66,7 +67,7 @@ export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.Da
 
 // ------------------------------ METHODS ------------------------------
 
-function toFormatedJSON (this: VideoAbuseInstance) {
+toFormatedJSON = function (this: VideoAbuseInstance) {
   let reporterPodHost
 
   if (this.Pod) {
@@ -108,7 +109,7 @@ function associate (models) {
   })
 }
 
-listForApi = function (start, count, sort, callback) {
+listForApi = function (start: number, count: number, sort: string, callback: VideoAbuseMethods.ListForApiCallback) {
   const query = {
     offset: start,
     limit: count,
diff --git a/server/models/video/video-blacklist-interface.ts b/server/models/video/video-blacklist-interface.ts
index c34e7fb09..d4d6528d1 100644
--- a/server/models/video/video-blacklist-interface.ts
+++ b/server/models/video/video-blacklist-interface.ts
@@ -39,6 +39,8 @@ export interface BlacklistedVideoInstance extends BlacklistedVideoClass, Blackli
   id: number
   createdAt: Date
   updatedAt: Date
+
+  toFormatedJSON: BlacklistedVideoMethods.ToFormatedJSON
 }
 
 export interface BlacklistedVideoModel extends BlacklistedVideoClass, Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes> {}
diff --git a/server/models/video/video-interface.ts b/server/models/video/video-interface.ts
index 5fefc2bb1..4b591b9e7 100644
--- a/server/models/video/video-interface.ts
+++ b/server/models/video/video-interface.ts
@@ -146,6 +146,17 @@ export interface VideoInstance extends VideoClass, VideoAttributes, Sequelize.In
   id: string
   createdAt: Date
   updatedAt: Date
+
+  generateMagnetUri: VideoMethods.GenerateMagnetUri
+  getVideoFilename: VideoMethods.GetVideoFilename
+  getThumbnailName: VideoMethods.GetThumbnailName
+  getPreviewName: VideoMethods.GetPreviewName
+  getTorrentName: VideoMethods.GetTorrentName
+  isOwned: VideoMethods.IsOwned
+  toFormatedJSON: VideoMethods.ToFormatedJSON
+  toAddRemoteJSON: VideoMethods.ToAddRemoteJSON
+  toUpdateRemoteJSON: VideoMethods.ToUpdateRemoteJSON
+  transcodeVideofile: VideoMethods.TranscodeVideofile
 }
 
 export interface VideoModel extends VideoClass, Sequelize.Model<VideoInstance, VideoAttributes> {}