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

Fix videos overview tags section

Browse source
This commit is contained in:
Chocobozzz 2018-08-31 17:32:35 +02:00
parent 9a629c6efb
commit 4b54f1360e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/models/utils.ts
View file

@ -4,7 +4,11 @@ type SortType = { sortModel: any, sortValue: string }
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
const { direction, field } = buildDirectionAndField(value)
let { direction, field } = buildDirectionAndField(value)
if (field.toLowerCase() === 'match') { // Search
field = Sequelize.col('similarity')
}
return [ [ field, direction ], lastSort ]
}
@ -13,10 +17,9 @@ function getVideoSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let { direction, field } = buildDirectionAndField(value)
// Alias
if (field.toLowerCase() === 'match') field = Sequelize.col('similarity')
// Sort by aggregation
if (field.toLowerCase() === 'trending') {
if (field.toLowerCase() === 'match') { // Search
field = Sequelize.col('similarity')
} else if (field.toLowerCase() === 'trending') { // Sort by aggregation
return [
[ Sequelize.fn('COALESCE', Sequelize.fn('SUM', Sequelize.col('VideoViews.views')), '0'), direction ],