diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js index 96a8dfab..c0d8e8d3 100644 --- a/commands/Economy/leaderboard.js +++ b/commands/Economy/leaderboard.js @@ -27,7 +27,7 @@ class Leaderboard extends Command { const members = await this.client.membersData.find({ guildID: message.guild.id }).lean(), membersLeaderboard = members.map((m) => { return { - id: m.id + 1, + id: m.id, value: m.money + m.bankSold }; }).sort((a,b) => b.value - a.value); @@ -40,7 +40,7 @@ class Leaderboard extends Command { const members = await this.client.membersData.find({ guildID: message.guild.id }).lean(), membersLeaderboard = members.map((m) => { return { - id: m.id + 1, + id: m.id, value: m.level }; }).sort((a,b) => b.value - a.value); @@ -53,7 +53,7 @@ class Leaderboard extends Command { const users = await this.client.usersData.find().lean(), usersLeaderboard = users.map((u) => { return { - id: u.id + 1, + id: u.id, value: u.rep }; }).sort((a,b) => b.value - a.value); @@ -65,23 +65,23 @@ class Leaderboard extends Command { }; if (isOnlyOnMobile) message.sendT("economy/leaderboard:MOBILE"); - - async function fetchUsers(array, table, client) { - return new Promise((resolve) => { - let index = 0; - array.forEach((element) => { - client.users.fetch(element.id).then((user) => { - const regEx = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g; - let username = user.username.replace(regEx, ""); - if (username.length > 20) username = username.substr(0, 20); - - table.addRow(index++, username, element.value); - }); - }); - resolve(table); - }); - }; } }; -module.exports = Leaderboard; \ No newline at end of file +module.exports = Leaderboard; + +async function fetchUsers(array, table, client) { + return new Promise((resolve) => { + let index = 1; + array.forEach((element) => { + client.users.fetch(element.id).then((user) => { + const regEx = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g; + let username = user.username.replace(regEx, ""); + if (username.length > 20) username = username.substr(0, 20); + + table.addRow(index++, username, element.value); + }); + }); + resolve(table); + }); +}; \ No newline at end of file