aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-08-27 14:32:44 +0200
committerChocobozzz <me@florianbigard.com>2021-08-27 15:12:22 +0200
commit41fb13c330de629df2d23379209e79c7af0f2e9a (patch)
tree73bc5a90566406b3910f142beae2a879c1e4265d /server/models
parent40e7ed0714f96c01e16de3ac971a4b28116294e1 (diff)
downloadPeerTube-41fb13c330de629df2d23379209e79c7af0f2e9a.tar.gz
PeerTube-41fb13c330de629df2d23379209e79c7af0f2e9a.tar.zst
PeerTube-41fb13c330de629df2d23379209e79c7af0f2e9a.zip
esModuleInterop to true
Diffstat (limited to 'server/models')
-rw-r--r--server/models/application/application.ts2
-rw-r--r--server/models/model-cache.ts3
-rw-r--r--server/models/video/video-comment.ts2
-rw-r--r--server/models/video/video-file.ts2
-rw-r--r--server/models/video/video-streaming-playlist.ts2
-rw-r--r--server/models/video/video-view.ts12
-rw-r--r--server/models/video/video.ts2
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 @@
1import * as memoizee from 'memoizee' 1import memoizee from 'memoizee'
2import { AllowNull, Column, Default, DefaultScope, HasOne, IsInt, Model, Table } from 'sequelize-typescript' 2import { AllowNull, Column, Default, DefaultScope, HasOne, IsInt, Model, Table } from 'sequelize-typescript'
3import { AttributesOnly } from '@shared/core-utils' 3import { AttributesOnly } from '@shared/core-utils'
4import { AccountModel } from '../account/account' 4import { 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 @@
1import { Model } from 'sequelize-typescript' 1import { Model } from 'sequelize-typescript'
2import * as Bluebird from 'bluebird'
3import { logger } from '@server/helpers/logger' 2import { logger } from '@server/helpers/logger'
4 3
5type ModelCacheType = 4type ModelCacheType =
@@ -52,7 +51,7 @@ class ModelCache {
52 51
53 if (cache.has(key)) { 52 if (cache.has(key)) {
54 logger.debug('Model cache hit for %s -> %s.', cacheType, key) 53 logger.debug('Model cache hit for %s -> %s.', cacheType, key)
55 return Bluebird.resolve<T>(cache.get(key)) 54 return Promise.resolve<T>(cache.get(key))
56 } 55 }
57 56
58 return fun().then(m => { 57 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
585 585
586 if (accountId) { 586 if (accountId) {
587 whereAnd.push({ 587 whereAnd.push({
588 [Op.eq]: accountId 588 accountId
589 }) 589 })
590 } 590 }
591 591
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 @@
1import { remove } from 'fs-extra' 1import { remove } from 'fs-extra'
2import * as memoizee from 'memoizee' 2import memoizee from 'memoizee'
3import { join } from 'path' 3import { join } from 'path'
4import { FindOptions, Op, Transaction } from 'sequelize' 4import { FindOptions, Op, Transaction } from 'sequelize'
5import { 5import {
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 @@
1import * as memoizee from 'memoizee' 1import memoizee from 'memoizee'
2import { join } from 'path' 2import { join } from 'path'
3import { Op } from 'sequelize' 3import { Op } from 'sequelize'
4import { 4import {
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 @@
1import * as Sequelize from 'sequelize' 1import { literal, Op } from 'sequelize'
2import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table } from 'sequelize-typescript' 2import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Model, Table } from 'sequelize-typescript'
3import { AttributesOnly } from '@shared/core-utils' 3import { AttributesOnly } from '@shared/core-utils'
4import { VideoModel } from './video' 4import { VideoModel } from './video'
5 5
@@ -20,11 +20,11 @@ export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>
20 createdAt: Date 20 createdAt: Date
21 21
22 @AllowNull(false) 22 @AllowNull(false)
23 @Column(Sequelize.DATE) 23 @Column(DataType.DATE)
24 startDate: Date 24 startDate: Date
25 25
26 @AllowNull(false) 26 @AllowNull(false)
27 @Column(Sequelize.DATE) 27 @Column(DataType.DATE)
28 endDate: Date 28 endDate: Date
29 29
30 @AllowNull(false) 30 @AllowNull(false)
@@ -47,10 +47,10 @@ export class VideoViewModel extends Model<Partial<AttributesOnly<VideoViewModel>
47 const query = { 47 const query = {
48 where: { 48 where: {
49 startDate: { 49 startDate: {
50 [Sequelize.Op.lt]: beforeDate 50 [Op.lt]: beforeDate
51 }, 51 },
52 videoId: { 52 videoId: {
53 [Sequelize.Op.in]: Sequelize.literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)') 53 [Op.in]: literal('(SELECT "id" FROM "video" WHERE "remote" IS TRUE)')
54 } 54 }
55 } 55 }
56 } 56 }
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 @@
1import * as Bluebird from 'bluebird' 1import Bluebird from 'bluebird'
2import { remove } from 'fs-extra' 2import { remove } from 'fs-extra'
3import { maxBy, minBy } from 'lodash' 3import { maxBy, minBy } from 'lodash'
4import { join } from 'path' 4import { join } from 'path'