From 2d58e3a6312a6e0598518cd6508de4e9d5e6a315 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Mon, 15 Jun 2020 10:35:14 -0400 Subject: [PATCH] Filter hidden and unknown commands out of lb --- commands/util-public/command-leaderboard.js | 14 +++++++++----- package.json | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/commands/util-public/command-leaderboard.js b/commands/util-public/command-leaderboard.js index 79f75e6f..b70f33b3 100644 --- a/commands/util-public/command-leaderboard.js +++ b/commands/util-public/command-leaderboard.js @@ -23,20 +23,20 @@ module.exports = class CommandLeaderboardCommand extends Command { } run(msg, { page }) { - const totalPages = Math.ceil(this.client.registry.commands.size / 10); + const commands = this.filterCommands(this.client.registry.commands); + const totalPages = Math.ceil(commands.size / 10); if (page > totalPages) return msg.say(`Page ${page} does not exist (yet).`); return msg.say(stripIndents` __**Command Usage Leaderboard (Page ${page}/${totalPages}):**__ - ${this.makeLeaderboard(page).join('\n')} + ${this.makeLeaderboard(commands, page).join('\n')} `); } - makeLeaderboard(page) { + makeLeaderboard(commands, page) { let i = 0; let previousPts = null; let positionsMoved = 1; - return this.client.registry.commands - .filter(command => command.uses !== undefined) + return commands .sort((a, b) => b.uses - a.uses) .map(command => { if (previousPts === command.uses) { @@ -50,4 +50,8 @@ module.exports = class CommandLeaderboardCommand extends Command { }) .slice((page - 1) * 10, page * 10); } + + filterCommands(commands) { + return commands.filter(command => command.uses !== undefined && !command.unknown && !command.hidden); + } }; diff --git a/package.json b/package.json index 886aebba..ed19e972 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.27.2", + "version": "116.27.3", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {