diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-10-22 16:39:37 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-10-22 16:40:48 +0200 |
| commit | 0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b (patch) | |
| tree | 8e01303d264792e114c20a0d1d530df48841ee6f /server/models/utils.ts | |
| parent | 532e6a4172154716d6c6ab2a7f715625d600987c (diff) | |
| download | PeerTube-0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b.tar.gz PeerTube-0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b.tar.zst PeerTube-0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b.zip | |
Fix sequelize order typings
Diffstat (limited to 'server/models/utils.ts')
| -rw-r--r-- | server/models/utils.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/utils.ts b/server/models/utils.ts index 83b2b8f03..6a109056f 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts | |||
| @@ -74,8 +74,8 @@ function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): Or | |||
| 74 | finalField = field | 74 | finalField = field |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | const firstSort = typeof finalField === 'string' | 77 | const firstSort: OrderItem = typeof finalField === 'string' |
| 78 | ? finalField.split('.').concat([ direction ]) as any // FIXME: sequelize typings | 78 | ? finalField.split('.').concat([ direction ]) as OrderItem |
| 79 | : [ finalField, direction ] | 79 | : [ finalField, direction ] |
| 80 | 80 | ||
| 81 | return [ firstSort, lastSort ] | 81 | return [ firstSort, lastSort ] |
| @@ -84,7 +84,7 @@ function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): Or | |||
| 84 | function getBlacklistSort (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { | 84 | function getBlacklistSort (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { |
| 85 | const [ firstSort ] = getSort(value) | 85 | const [ firstSort ] = getSort(value) |
| 86 | 86 | ||
| 87 | if (model) return [ [ literal(`"${model}.${firstSort[0]}" ${firstSort[1]}`) ], lastSort ] as any[] // FIXME: typings | 87 | if (model) return [ [ literal(`"${model}.${firstSort[0]}" ${firstSort[1]}`) ], lastSort ] as OrderItem[] |
| 88 | return [ firstSort, lastSort ] | 88 | return [ firstSort, lastSort ] |
| 89 | } | 89 | } |
| 90 | 90 | ||