fix(ordering): Allow ordering queue listings

Author: andris9

.ncurc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    upgrade: true,
+    reject: [
+        // mongodb 5.x driver does not support callbacks, only promises
+        'mongodb'
+    ]
+};

app.js

@@ -12,7 +12,7 @@ const path = require('path');
 const logger = require('morgan');
 const cookieParser = require('cookie-parser');
 const session = require('express-session');
-const RedisStore = require('connect-redis')(session);
+const RedisStore = require('connect-redis').default;
 const flash = require('connect-flash');
 const hbs = require('hbs');
 const humanize = require('humanize');

lib/db.js

@@ -5,7 +5,7 @@ const yaml = require('js-yaml');
 const fs = require('fs');
 const log = require('npmlog');
 const pathlib = require('path');
-const setupIndexes = yaml.safeLoad(fs.readFileSync(pathlib.join(__dirname, '..', 'setup', 'indexes.yaml'), 'utf8'));
+const setupIndexes = yaml.load(fs.readFileSync(pathlib.join(__dirname, '..', 'setup', 'indexes.yaml'), 'utf8'));
 const mongodb = require('mongodb');
 const Redis = require('ioredis');
 

lib/handler.js

@@ -3,6 +3,7 @@
 const config = require('wild-config');
 const request = require('request');
 const redis = require('./db').redis;
+const URL = require('url').URL;
 
 let lastCheck = false;
 let currentSpeed = new Map();
@@ -151,9 +152,15 @@ function fetchZoneList(callback) {
     );
 }
 
-function fetchQueued(zone, type, callback) {
+function fetchQueued(zone, type, query, callback) {
+    const url = new URL('/queued/' + encodeURIComponent(type) + '/' + encodeURIComponent(zone), config.apiServer);
+
+    for (let key of Object.keys(query || {})) {
+        url.searchParams.append(key, query[key]);
+    }
+
     request(
-        config.apiServer + '/queued/' + encodeURIComponent(type) + '/' + encodeURIComponent(zone),
+        url.href,
         {
             json: true
         },