Move models to typescript-sequelize

3 files changed, 15 insertions, 15 deletions

diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index 428333528..a22e2ed6a 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,12 +1,10 @@
-import * as rimraf from 'rimraf'
 import * as Promise from 'bluebird'
+import * as rimraf from 'rimraf'
+import { CONFIG, initDatabase, sequelizeTypescript } from '../../../server/initializers'
 
-import { CONFIG } from '../../../server/initializers/constants'
-import { database as db } from '../../../server/initializers/database'
-
-db.init(true)
+initDatabase(true)
   .then(() => {
-    return db.sequelize.drop()
+    return sequelizeTypescript.drop()
   })
   .then(() => {
     console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index f0c06a7bf..a6863f807 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -1,6 +1,6 @@
 import * as program from 'commander'
-
-import { database as db } from '../server/initializers/database'
+import { initDatabase } from '../server/initializers'
+import { UserModel } from '../server/models/account/user'
 
 program
   .option('-u, --user [user]', 'User')
@@ -11,9 +11,9 @@ if (program['user'] === undefined) {
   process.exit(-1)
 }
 
-db.init(true)
+initDatabase(true)
   .then(() => {
-    return db.User.loadByUsername(program['user'])
+    return UserModel.loadByUsername(program['user'])
   })
   .then(user => {
     if (!user) {
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index 759443623..ba4656b75 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,12 +1,14 @@
-import { database as db } from '../server/initializers/database'
-import { getServerAccount } from '../server/helpers/utils'
+import { getServerAccount } from '../server/helpers'
+import { initDatabase } from '../server/initializers'
+import { AccountFollowModel } from '../server/models/account/account-follow'
+import { VideoModel } from '../server/models/video/video'
 
-db.init(true)
+initDatabase(true)
   .then(() => {
     return getServerAccount()
   })
   .then(serverAccount => {
-    return db.AccountFollow.listAcceptedFollowingUrlsForApi([ serverAccount.id ], undefined)
+    return AccountFollowModel.listAcceptedFollowingUrlsForApi([ serverAccount.id ], undefined)
   })
   .then(res => {
     return res.total > 0
@@ -18,7 +20,7 @@ db.init(true)
     }
 
     console.log('Updating torrent files.')
-    return db.Video.list()
+    return VideoModel.list()
   })
   .then(videos => {
     const tasks: Promise<any>[] = []