esModuleInterop to true

7 files changed, 12 insertions, 13 deletions

diff --git a/server/models/application/application.ts b/server/models/application/application.ts
index 5531d134a..e3939383b 100644
--- a/server/models/application/application.ts
+++ b/server/models/application/application.ts
@@ -1,4 +1,4 @@
-import * as memoizee from 'memoizee'
+import memoizee from 'memoizee'
 import { AllowNull, Column, Default, DefaultScope, HasOne, IsInt, Model, Table } from 'sequelize-typescript'
 import { AttributesOnly } from '@shared/core-utils'
 import { AccountModel } from '../account/account'
diff --git a/server/models/model-cache.ts b/server/models/model-cache.ts
index eafb5c13c..3651267e7 100644
--- a/server/models/model-cache.ts
+++ b/server/models/model-cache.ts
@@ -1,5 +1,4 @@
 import { Model } from 'sequelize-typescript'
-import * as Bluebird from 'bluebird'
 import { logger } from '@server/helpers/logger'
 
 type ModelCacheType =
@@ -52,7 +51,7 @@ class ModelCache {
 
     if (cache.has(key)) {
       logger.debug('Model cache hit for %s -> %s.', cacheType, key)
-      return Bluebird.resolve<T>(cache.get(key))
+      return Promise.resolve<T>(cache.get(key))
     }
 
     return fun().then(m => {
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index e933989ae..c89279c65 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -585,7 +585,7 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
 
     if (accountId) {
       whereAnd.push({
-        [Op.eq]: accountId
+        accountId
       })
     }
 
diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts
index 627c95763..5e8d29d0a 100644
--- a/server/models/video/video-file.ts
+++ b/server/models/video/video-file.ts
@@ -1,5 +1,5 @@
 import { remove } from 'fs-extra'
-import * as memoizee from 'memoizee'
+import memoizee from 'memoizee'
 import { join } from 'path'
 import { FindOptions, Op, Transaction } from 'sequelize'
 import {
diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts
index 3e9fd97c7..18d96c750 100644
--- a/server/models/video/video-streaming-playlist.ts
+++ b/server/models/video/video-streaming-playlist.ts
@@ -1,4 +1,4 @@
-import * as memoizee from 'memoizee'
+import memoizee from 'memoizee'
 import { join } from 'path'
 import { Op } from 'sequelize'
 import {
diff --git a/server/models/video/video-view.ts b/server/models/video/video-view.ts
index dfc6296ce..b51f0f84d 100644
--- a/server/models/video/video-view.ts
+++ b/server/models/video/video-view.ts
@@ -1,5 +1,5 @@
-import * as Sequelize from 'sequelize'
-import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript'
+import { literal, Op } from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Model, Table } from 'sequelize-typescript'
 import { AttributesOnly } from '@shared/core-utils'
 import { VideoModel } from './video'
 
@@ -20,11 +20,11 @@ export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>
   createdAt: Date
 
   @AllowNull(false)
-  @Column(Sequelize.DATE)
+  @Column(DataType.DATE)
   startDate: Date
 
   @AllowNull(false)
-  @Column(Sequelize.DATE)
+  @Column(DataType.DATE)
   endDate: Date
 
   @AllowNull(false)
@@ -47,10 +47,10 @@ export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>
     const query = {
       where: {
         startDate: {
-          [Sequelize.Op.lt]: beforeDate
+          [Op.lt]: beforeDate
         },
         videoId: {
-          [Sequelize.Op.in]: Sequelize.literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)')
+          [Op.in]: literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)')
         }
       }
     }
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 874ad168a..e0c4dd2db 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1,4 +1,4 @@
-import * as Bluebird from 'bluebird'
+import Bluebird from 'bluebird'
 import { remove } from 'fs-extra'
 import { maxBy, minBy } from 'lodash'
 import { join } from 'path'