From 4b54f1360ebb5b1aeb70544981f2721e9a03f0bb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 31 Aug 2018 17:32:35 +0200
Subject: Fix videos overview tags section

---
 server/models/utils.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'server/models')

diff --git a/server/models/utils.ts b/server/models/utils.ts
index edb8e1161..e0bf091ad 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -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 ],
 
-- 
cgit v1.2.3