jeena/PeerTube
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fix blacklist sort

Browse source
This commit is contained in:
Chocobozzz 2019-09-04 16:23:37 +02:00
parent 5eb9bde8aa
commit 951532924c
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/models/utils.ts
View file

@ -1,9 +1,9 @@
import { Model, Sequelize } from 'sequelize-typescript'
import * as validator from 'validator'
import { Col } from 'sequelize/types/lib/utils'
import { OrderItem, literal } from 'sequelize'
import { col, literal, OrderItem } from 'sequelize'
type SortType = { sortModel: any, sortValue: string }
type SortType = { sortModel: string, sortValue: string }
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
@ -51,10 +51,10 @@ function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): Or
return [ firstSort, lastSort ]
}
function getSortOnModel (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
function getBlacklistSort (model: any, value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
const [ firstSort ] = getSort(value)
if (model) return [ [ model, firstSort[0], firstSort[1] ], lastSort ]
if (model) return [ [ literal(`"${model}.${firstSort[ 0 ]}" ${firstSort[ 1 ]}`) ], lastSort ] as any[] // FIXME: typings
return [ firstSort, lastSort ]
}
@ -155,7 +155,7 @@ export {
buildLocalAccountIdsIn,
getSort,
getVideoSort,
getSortOnModel,
getBlacklistSort,
createSimilarityAttribute,
throwIfNotValid,
buildServerIdsFollowedBy,