1 files changed, 57 insertions, 38 deletions

diff --git a/server/models/video-abuse.ts b/server/models/video-abuse.ts
index 2a18a293d..92168439c 100644
--- a/server/models/video-abuse.ts
+++ b/server/models/video-abuse.ts
@@ -1,9 +1,22 @@
+import * as Sequelize from 'sequelize'
+
 import { CONFIG } from '../initializers'
 import { isVideoAbuseReporterUsernameValid, isVideoAbuseReasonValid } from '../helpers'
-import { getSort } from './utils'
 
-module.exports = function (sequelize, DataTypes) {
-  const VideoAbuse = sequelize.define('VideoAbuse',
+import { addMethodsToModel, getSort } from './utils'
+import {
+  VideoAbuseClass,
+  VideoAbuseInstance,
+  VideoAbuseAttributes,
+
+  VideoAbuseMethods
+} from './video-abuse-interface'
+
+let VideoAbuse: Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes>
+let listForApi: VideoAbuseMethods.ListForApi
+
+export default function (sequelize, DataTypes) {
+  VideoAbuse = sequelize.define('VideoAbuse',
     {
       reporterUsername: {
         type: DataTypes.STRING,
@@ -34,25 +47,51 @@ module.exports = function (sequelize, DataTypes) {
         {
           fields: [ 'reporterPodId' ]
         }
-      ],
-      classMethods: {
-        associate,
-
-        listForApi
-      },
-      instanceMethods: {
-        toFormatedJSON
-      }
+      ]
     }
   )
 
+  const classMethods = [
+    associate,
+
+    listForApi
+  ]
+  const instanceMethods = [
+    toFormatedJSON
+  ]
+  addMethodsToModel(VideoAbuse, classMethods, instanceMethods)
+
   return VideoAbuse
 }
 
-// ---------------------------------------------------------------------------
+// ------------------------------ METHODS ------------------------------
+
+function toFormatedJSON () {
+  let reporterPodHost
+
+  if (this.Pod) {
+    reporterPodHost = this.Pod.host
+  } else {
+    // It means it's our video
+    reporterPodHost = CONFIG.WEBSERVER.HOST
+  }
+
+  const json = {
+    id: this.id,
+    reporterPodHost,
+    reason: this.reason,
+    reporterUsername: this.reporterUsername,
+    videoId: this.videoId,
+    createdAt: this.createdAt
+  }
+
+  return json
+}
+
+// ------------------------------ STATICS ------------------------------
 
 function associate (models) {
-  this.belongsTo(models.Pod, {
+  VideoAbuse.belongsTo(models.Pod, {
     foreignKey: {
       name: 'reporterPodId',
       allowNull: true
@@ -60,7 +99,7 @@ function associate (models) {
     onDelete: 'cascade'
   })
 
-  this.belongsTo(models.Video, {
+  VideoAbuse.belongsTo(models.Video, {
     foreignKey: {
       name: 'videoId',
       allowNull: false
@@ -69,44 +108,24 @@ function associate (models) {
   })
 }
 
-function listForApi (start, count, sort, callback) {
+listForApi = function (start, count, sort, callback) {
   const query = {
     offset: start,
     limit: count,
     order: [ getSort(sort) ],
     include: [
       {
-        model: this.sequelize.models.Pod,
+        model: VideoAbuse['sequelize'].models.Pod,
         required: false
       }
     ]
   }
 
-  return this.findAndCountAll(query).asCallback(function (err, result) {
+  return VideoAbuse.findAndCountAll(query).asCallback(function (err, result) {
     if (err) return callback(err)
 
     return callback(null, result.rows, result.count)
   })
 }
 
-function toFormatedJSON () {
-  let reporterPodHost
-
-  if (this.Pod) {
-    reporterPodHost = this.Pod.host
-  } else {
-    // It means it's our video
-    reporterPodHost = CONFIG.WEBSERVER.HOST
-  }
-
-  const json = {
-    id: this.id,
-    reporterPodHost,
-    reason: this.reason,
-    reporterUsername: this.reporterUsername,
-    videoId: this.videoId,
-    createdAt: this.createdAt
-  }
 
-  return json
-}