arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-26 22:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce code dupe

Browse Source
This commit is contained in:
Dragon Fire
2020-06-09 10:16:37 -04:00
parent 2e1a30f62d
commit 362e55a370
6 changed files with 30 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-mp/bingo.js
+3 -22
View File
@@ -1,7 +1,7 @@
const Command = require('../../structures/Command');
const Collection = require('@discordjs/collection');
const { stripIndents } = require('common-tags');
const { SUCCESS_EMOJI_ID } = process.env;
const { awaitPlayers } = require('../../util/Util');
const nums = require('../../assets/json/bingo');
const rows = Object.keys(nums);
const callNums = Array.from({ length: 75 }, (v, i) => i + 1);
@@ -31,7 +31,7 @@ module.exports = class BingoCommand extends Command {
if (current) return msg.reply(`Please wait until the current game of \`${current.name}\` is finished.`);
this.client.games.set(msg.channel.id, { name: this.name });
try {
const awaitedPlayers = await this.awaitPlayers(msg, playersCount);
const awaitedPlayers = await awaitPlayers(msg, playersCount);
if (!awaitedPlayers) {
this.client.games.delete(msg.channel.id);
return msg.say('Game could not be started...');
@@ -65,7 +65,7 @@ module.exports = class BingoCommand extends Command {
**${this.findRowValue(picked)} ${picked}**!
Check your DMs for your board. If you have bingo, type \`bingo\`!
_Next number will be called in 20 seconds._
_Next number will be called in 20 seconds. ${validNums.length - 1} numbers left._
`);
const filter = res => {
if (!players.has(res.author.id)) return false;
@@ -89,25 +89,6 @@ module.exports = class BingoCommand extends Command {
}
}
async awaitPlayers(msg, players) {
if (players === 1) return [msg.author.id];
await msg.say(`You will need at least 1 more player (at max ${players - 1}). To join, type \`join game\`.`);
const joined = [];
joined.push(msg.author.id);
const filter = res => {
if (res.author.bot) return false;
if (joined.includes(res.author.id)) return false;
if (res.content.toLowerCase() !== 'join game') return false;
joined.push(res.author.id);
res.react(SUCCESS_EMOJI_ID || '✅').catch(() => null);
return true;
};
const verify = await msg.channel.awaitMessages(filter, { max: players - 1, time: 30000 });
verify.set(msg.id, msg);
if (verify.size < 1) return false;
return verify.map(player => player.author.id);
}
generateBoard() {
const result = [];
for (const [rowID, values] of Object.entries(nums)) {