diff --git a/core/client_connections.js b/core/client_connections.js index f0bca4d7..6b8faf65 100644 --- a/core/client_connections.js +++ b/core/client_connections.js @@ -11,7 +11,7 @@ const moment = require('moment'); const hashids = require('hashids'); exports.getActiveConnections = getActiveConnections; -exports.getActiveNodeList = getActiveNodeList; +exports.getActiveConnectionList = getActiveConnectionList; exports.addNewClient = addNewClient; exports.removeClient = removeClient; exports.getConnectionByUserId = getConnectionByUserId; @@ -26,7 +26,7 @@ function getActiveConnections(authUsersOnly = false) { }); } -function getActiveNodeList(authUsersOnly) { +function getActiveConnectionList(authUsersOnly) { if(!_.isBoolean(authUsersOnly)) { authUsersOnly = true; diff --git a/core/node_msg.js b/core/node_msg.js index 2c6f23ed..276dae2f 100644 --- a/core/node_msg.js +++ b/core/node_msg.js @@ -5,7 +5,7 @@ const { MenuModule } = require('./menu_module.js'); const { Errors } = require('./enig_error.js'); const { - getActiveNodeList, + getActiveConnectionList, getConnectionByNodeId, } = require('./client_connections.js'); const UserInterruptQueue = require('./user_interrupt_queue.js'); @@ -110,7 +110,7 @@ exports.getModule = class NodeMessageModule extends MenuModule { location : 'N/A', affils : 'N/A', timeOn : 'N/A', - }].concat(getActiveNodeList(true) + }].concat(getActiveConnectionList(true) .map(node => Object.assign(node, { text : node.node.toString() } )) ).filter(node => node.node !== this.client.node); // remove our client's node this.nodeList.sort( (a, b) => a.node - b.node ); // sort by node diff --git a/core/whos_online.js b/core/whos_online.js index 0ea2321a..5910bd29 100644 --- a/core/whos_online.js +++ b/core/whos_online.js @@ -2,9 +2,9 @@ 'use strict'; // ENiGMA½ -const { MenuModule } = require('./menu_module.js'); -const { getActiveNodeList } = require('./client_connections.js'); -const { Errors } = require('./enig_error.js'); +const { MenuModule } = require('./menu_module.js'); +const { getActiveConnectionList } = require('./client_connections.js'); +const { Errors } = require('./enig_error.js'); // deps const async = require('async'); @@ -43,7 +43,7 @@ exports.getModule = class WhosOnlineModule extends MenuModule { return cb(Errors.MissingMci(`Missing online list MCI ${MciViewIds.onlineList}`)); } - const onlineList = getActiveNodeList(true).slice(0, onlineListView.height).map( + const onlineList = getActiveConnectionList(true).slice(0, onlineListView.height).map( oe => Object.assign(oe, { text : oe.userName, timeOn : _.upperFirst(oe.timeOn.humanize()) }) );