joan/Haha-Yes
1
0
Fork 0
forked from Supositware/Haha-Yes
Code Pull requests Activity

Merge branch 'master' of https://gitlab.com/loicbersier/discordbot

Browse source
This commit is contained in:
loicbersier 2019-12-07 19:32:38 +01:00
commit 6a33780f38
4 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
commands/minigame/rps.js
View file

@ -1,65 +1,65 @@
const { Command } = require('discord-akairo'); const { Command } = require('discord-akairo');
class rpsCommand extends Command { class rpsCommand extends Command {
constructor() { constructor() {
super('rps', { super('rps', {
aliases: ['rps', 'rockpapersci'], aliases: ['rps', 'rockpapersci'],
category: 'minigame', category: 'minigame',
clientPermissions: ['SEND_MESSAGES'], clientPermissions: ['SEND_MESSAGES'],
args: [ args: [
{ {
id: 'selection', id: 'selection',
type: 'string', type: 'string',
match: 'rest', match: 'rest',
}, },
], ],
description: { description: {
content: 'Simply rock paper scissors\nCredit to: druid#0425 (276882603158798336))', content: 'Simply rock paper scissors\nCredit to: druid#0425 (276882603158798336)',
usage: '[rock/paper/scissors]', usage: '[rock/paper/scissors]',
examples: ['rock'] examples: ['rock']
} }
}); });
} }
async exec(message, args) { async exec(message, args) {
let pcHand = Math.floor((Math.random()*3)+1); let pcHand = Math.floor((Math.random()*3)+1);
let playerHand = args.selection; let playerHand = args.selection;
switch (playerHand) { switch (playerHand) {
case 'rock': case 'rock':
if (pcHand==1) { if (pcHand==1) {
message.channel.send('You both chose rock!'); message.channel.send('You both chose rock!');
} else if (pcHand==2) { } else if (pcHand==2) {
message.channel.send('The bot chose paper, you lose!'); message.channel.send('The bot chose paper, you lose!');
} else { } else {
message.channel.send('The bot chose scissors, you win!'); message.channel.send('The bot chose scissors, you win!');
} }
break; break;
case 'paper': case 'paper':
if (pcHand==1) { if (pcHand==1) {
message.channel.send('You both chose paper!'); message.channel.send('You both chose paper!');
} else if (pcHand==2) { } else if (pcHand==2) {
message.channel.send('The bot chose scissors, you lose!'); message.channel.send('The bot chose scissors, you lose!');
} else { } else {
message.channel.send('The bot chose rock, you win!'); message.channel.send('The bot chose rock, you win!');
} }
break; break;
case 'scissors': case 'scissors':
if (pcHand==1) { if (pcHand==1) {
message.channel.send('You both chose scissors!'); message.channel.send('You both chose scissors!');
} else if (pcHand==2) { } else if (pcHand==2) {
message.channel.send('The bot chose rock, you lose!'); message.channel.send('The bot chose rock, you lose!');
} else { } else {
message.channel.send('The bot chose paper, you win!'); message.channel.send('The bot chose paper, you win!');
} }
break; break;
default: default:
message.channel.send(`You entered ${playerHand} which is an incorrect choice.`); message.channel.send(`You entered ${playerHand} which is an incorrect choice.`);
break; break;
} }
} }
} }
module.exports = rpsCommand; module.exports = rpsCommand;

2
event/listeners/guildMemberAdd.js
View file

@ -15,7 +15,7 @@ class guildMemberAddListener extends Listener {
guild.setNickname('fart piss'); guild.setNickname('fart piss');
} }
const join = await joinChannel.findOne({where: {guildID: guild.id}}); const join = await joinChannel.findOne({where: {guildID: guild.guild.id}});
if (join) { if (join) {
const channel = this.client.channels.get(join.get('channelID')); const channel = this.client.channels.get(join.get('channelID'));

2
event/listeners/guildMemberRemove.js
View file

@ -11,7 +11,7 @@ class guildMemberRemoveListener extends Listener {
} }
async exec(guild) { async exec(guild) {
const leave = await leaveChannel.findOne({where: {guildID: guild.id}}); const leave = await leaveChannel.findOne({where: {guildID: guild.guild.id}});
if (leave) { if (leave) {
const channel = this.client.channels.get(leave.get('channelID')); const channel = this.client.channels.get(leave.get('channelID'));

4
event/listeners/messageReactionAdd.js
View file

@ -50,7 +50,7 @@ class MessageReactionAddListener extends Listener {
} }
} }
function sendEmbed(name, emote, client) { async function sendEmbed(name, emote, client) {
let channel; let channel;
if (name == 'starboard') { if (name == 'starboard') {
channel = client.channels.get(starboardChannel['starboard']); channel = client.channels.get(starboardChannel['starboard']);
@ -78,7 +78,7 @@ class MessageReactionAddListener extends Listener {
} else { } else {
Embed.setDescription(messageContent); Embed.setDescription(messageContent);
return channel.send({files: messageAttachments, embed: Embed}) return channel.send({files: messageAttachments, embed: Embed})
.catch(() => channel.send(messageAttachments, { embed: Embed})); .catch(async () => channel.send(messageAttachments, { embed: Embed}));
} }
} }
} }