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

Make DM Check optional

Browse Source
This commit is contained in:
Dragon Fire
2018-08-08 18:43:19 -04:00
parent 957a2b394f
commit 416e3a777a
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games/apples-to-apples.js
+1 -1
View File
@@ -32,7 +32,7 @@ module.exports = class ApplesToApplesCommand extends Command {
this.playing.add(msg.channel.id); this.playing.add(msg.channel.id);
try { try {
await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.'); await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.');
const awaitedPlayers = await awaitPlayers(msg, 10, 3); const awaitedPlayers = await awaitPlayers(msg, 10, 3, { dmCheck: true });
if (!awaitedPlayers) { if (!awaitedPlayers) {
this.playing.delete(msg.channel.id); this.playing.delete(msg.channel.id);
return msg.say('Game could not be started...'); return msg.say('Game could not be started...');
commands/games/cards-against-humanity.js
+1 -1
View File
@@ -33,7 +33,7 @@ module.exports = class CardsAgainstHumanityCommand extends Command {
this.playing.add(msg.channel.id); this.playing.add(msg.channel.id);
try { try {
await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.'); await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.');
const awaitedPlayers = await awaitPlayers(msg, 10, 3); const awaitedPlayers = await awaitPlayers(msg, 10, 3, { dmCheck: true });
if (!awaitedPlayers) { if (!awaitedPlayers) {
this.playing.delete(msg.channel.id); this.playing.delete(msg.channel.id);
return msg.say('Game could not be started...'); return msg.say('Game could not be started...');
commands/games/mafia.js
+1 -1
View File
@@ -23,7 +23,7 @@ module.exports = class MafiaCommand extends Command {
this.playing.add(msg.channel.id); this.playing.add(msg.channel.id);
try { try {
await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.'); await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.');
const awaitedPlayers = await awaitPlayers(msg, 10, 3); const awaitedPlayers = await awaitPlayers(msg, 10, 3, { dmCheck: true });
if (!awaitedPlayers) { if (!awaitedPlayers) {
this.playing.delete(msg.channel.id); this.playing.delete(msg.channel.id);
return msg.say('Game could not be started...'); return msg.say('Game could not be started...');
commands/games/wizard-convention.js
+1 -1
View File
@@ -23,7 +23,7 @@ module.exports = class WizardConventionCommand extends Command {
this.playing.add(msg.channel.id); this.playing.add(msg.channel.id);
try { try {
await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.'); await msg.say('You will need at least 2 more players, at maximum 10. To join, type `join game`.');
const awaitedPlayers = await awaitPlayers(msg, 10, 3); const awaitedPlayers = await awaitPlayers(msg, 10, 3, { dmCheck: true });
if (!awaitedPlayers) { if (!awaitedPlayers) {
this.playing.delete(msg.channel.id); this.playing.delete(msg.channel.id);
return msg.say('Game could not be started...'); return msg.say('Game could not be started...');
util/Util.js
+8 -6
View File
@@ -84,7 +84,7 @@ class Util {
return today; return today;
} }
static async awaitPlayers(msg, max, min, { text = 'join game', time = 30000 } = {}) { static async awaitPlayers(msg, max, min, { text = 'join game', time = 30000, dmCheck = false } = {}) {
const joined = []; const joined = [];
joined.push(msg.author.id); joined.push(msg.author.id);
const filter = res => { const filter = res => {
@@ -97,11 +97,13 @@ class Util {
}; };
const verify = await msg.channel.awaitMessages(filter, { max, time }); const verify = await msg.channel.awaitMessages(filter, { max, time });
verify.set(msg.id, msg); verify.set(msg.id, msg);
for (const message of verify.values()) { if (dmCheck) {
try { for (const message of verify.values()) {
await message.author.send('Hi! Just testing that DMs work, pay this no mind.'); try {
} catch (err) { await message.author.send('Hi! Just testing that DMs work, pay this no mind.');
verify.delete(message.id); } catch (err) {
verify.delete(message.id);
}
} }
} }
if (verify.size < min) return false; if (verify.size < min) return false;