aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
committerChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
commit00aab0666c6f772548c160fdfa871a8843b88f37 (patch)
tree73958f6f5d41371980f9653c8cb0ed8f46683c5a /server/models
parentbe04c6fdab5d91a7a57fa3ff36cde22a549c29da (diff)
parent951532924c1b3fd547cbf45f0c9cf9734203d6b4 (diff)
downloadPeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.gz
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.zst
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.zip
Merge branch 'release/1.4.0' into develop
Diffstat (limited to 'server/models')
-rw-r--r--server/models/utils.ts10
-rw-r--r--server/models/video/video-blacklist.ts7
2 files changed, 8 insertions, 9 deletions
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 24890f961..e7e6ddde1 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -1,9 +1,9 @@
1import { Model, Sequelize } from 'sequelize-typescript' 1import { Model, Sequelize } from 'sequelize-typescript'
2import * as validator from 'validator' 2import * as validator from 'validator'
3import { Col } from 'sequelize/types/lib/utils' 3import { Col } from 'sequelize/types/lib/utils'
4import { OrderItem, literal } from 'sequelize' 4import { col, literal, OrderItem } from 'sequelize'
5 5
6type SortType = { sortModel: any, sortValue: string } 6type SortType = { sortModel: string, sortValue: string }
7 7
8// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ] 8// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
9function getSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { 9function getSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
@@ -51,10 +51,10 @@ function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): Or
51 return [ firstSort, lastSort ] 51 return [ firstSort, lastSort ]
52} 52}
53 53
54function getSortOnModel (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { 54function getBlacklistSort (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
55 const [ firstSort ] = getSort(value) 55 const [ firstSort ] = getSort(value)
56 56
57 if (model) return [ [ model, firstSort[0], firstSort[1] ], lastSort ] 57 if (model) return [ [ literal(`"${model}.${firstSort[ 0 ]}" ${firstSort[ 1 ]}`) ], lastSort ] as any[] // FIXME: typings
58 return [ firstSort, lastSort ] 58 return [ firstSort, lastSort ]
59} 59}
60 60
@@ -155,7 +155,7 @@ export {
155 buildLocalAccountIdsIn, 155 buildLocalAccountIdsIn,
156 getSort, 156 getSort,
157 getVideoSort, 157 getVideoSort,
158 getSortOnModel, 158 getBlacklistSort,
159 createSimilarityAttribute, 159 createSimilarityAttribute,
160 throwIfNotValid, 160 throwIfNotValid,
161 buildServerIdsFollowedBy, 161 buildServerIdsFollowedBy,
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index b4df6cd6a..533bfe1ad 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,11 +1,11 @@
1import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' 1import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
2import { getSortOnModel, SortType, throwIfNotValid } from '../utils' 2import { getBlacklistSort, SortType, throwIfNotValid } from '../utils'
3import { VideoModel } from './video' 3import { VideoModel } from './video'
4import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' 4import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
5import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist' 5import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist'
6import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos' 6import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos'
7import { CONSTRAINTS_FIELDS } from '../../initializers/constants' 7import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
8import { FindOptions } from 'sequelize' 8import { FindOptions, literal } from 'sequelize'
9import { ThumbnailModel } from './thumbnail' 9import { ThumbnailModel } from './thumbnail'
10import * as Bluebird from 'bluebird' 10import * as Bluebird from 'bluebird'
11import { MVideoBlacklist, MVideoBlacklistFormattable } from '@server/typings/models' 11import { MVideoBlacklist, MVideoBlacklistFormattable } from '@server/typings/models'
@@ -59,14 +59,13 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
59 return { 59 return {
60 offset: start, 60 offset: start,
61 limit: count, 61 limit: count,
62 order: getSortOnModel(sort.sortModel, sort.sortValue) 62 order: getBlacklistSort(sort.sortModel, sort.sortValue)
63 } 63 }
64 } 64 }
65 65
66 const countQuery = buildBaseQuery() 66 const countQuery = buildBaseQuery()
67 67
68 const findQuery = buildBaseQuery() 68 const findQuery = buildBaseQuery()
69 findQuery.subQuery = false
70 findQuery.include = [ 69 findQuery.include = [
71 { 70 {
72 model: VideoModel, 71 model: VideoModel,