From d0766d5e392f54f9fa05bc73b6f52a4658b4bb8c Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Mon, 20 Sep 2021 17:08:36 +0300
Subject: [PATCH] Update utils.js

---
 scripts/helpers/utils.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/scripts/helpers/utils.js b/scripts/helpers/utils.js
index eb8f3d8146..9c83d86a2a 100644
--- a/scripts/helpers/utils.js
+++ b/scripts/helpers/utils.js
@@ -1,5 +1,6 @@
-const transliteration = require('transliteration')
+const { orderBy } = require('natural-orderby')
 const iso6393 = require('@freearhey/iso-639-3')
+const transliteration = require('transliteration')
 const categories = require('../data/categories')
 const regions = require('../data/regions')
 
@@ -54,20 +55,13 @@ utils.language2code = function (name) {
   return lang && lang.code ? lang.code : null
 }
 
-utils.sortBy = function (arr, fields) {
-  return arr.sort((a, b) => {
-    for (let field of fields) {
-      let propA = a[field] ? a[field].toLowerCase() : ''
-      let propB = b[field] ? b[field].toLowerCase() : ''
-      if (propA === 'undefined') return 1
-      if (propB === 'undefined') return -1
-      if (propA === 'other') return 1
-      if (propB === 'other') return -1
-      if (propA < propB) return -1
-      if (propA > propB) return 1
-    }
-    return 0
+utils.sortBy = function (arr, fields, order = null) {
+  fields = fields.map(field => {
+    if (field === 'resolution.height') return channel => channel.resolution.height || 0
+    if (field === 'status') return channel => channel.status || ''
+    return channel => channel[field]
   })
+  return orderBy(arr, fields, order)
 }
 
 utils.removeProtocol = function (string) {