daniel/discord-bot-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reworked calculate/compute into single command

Browse Source
This commit is contained in:
Daniel Tam
2018-07-17 23:33:40 -05:00
parent f51c5da206
commit f6fd5ba24f
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bot.js
View File

@@ -264,30 +264,16 @@ client.on('message', message => {
break; break;
case 'compute': case 'compute':
case 'convert': case 'convert':
if(message.content.substring(10).length > 0)
{
var response = calculate(message.content.substring(10));
if(response == "")
{
response = stupidQuestion();
}
message.channel.send(message.author + ' wants to compute: *' + message.content.substring(10) + '*\n' +
'The result is: **' + response + '**')
}
else
{
message.reply(noQuestion());
}
break;
case 'calculate': case 'calculate':
if(message.content.substring(12).length > 0) var message_content = message.content.substring(2).split(' ');
if(message_content[1].length > 0)
{ {
var response = calculate(message.content.substring(12)); var response = calculate(message.content.substring(message.content.indexOf(' ')+1));
if(response == "") if(response == "")
{ {
response = stupidQuestion(); response = stupidQuestion();
} }
message.channel.send(message.author + ' wants to compute: *' + message.content.substring(12) + '*\n' + message.channel.send(message.author + ' wants to compute: *' + message.content.substring(message.content.indexOf(' ')+1) + '*\n' +
'The result is: **' + response + '**') 'The result is: **' + response + '**')
} }
else else
@@ -306,12 +292,12 @@ client.on('message', message => {
case 'dankmemes': case 'dankmemes':
message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('dankmemes') : imgurRequest('dankmemes', 5)); message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('dankmemes') : imgurRequest('dankmemes', 5));
break; break;
/*case 'testcommand':
message.channel.send(subredditRequest('Nekomimi', 5));
break;*/
case 'source': case 'source':
message.channel.send("BunnyBot's source code: https://git.dtam.pw/daniel/discord-bot-js"); message.channel.send("BunnyBot's source code: https://git.dtam.pw/daniel/discord-bot-js");
break; break;
/*case 'testcommand':
message.channel.send(subredditRequest('Nekomimi', 5));
break;*/
// SFW Anime Image commands // SFW Anime Image commands
case 'meirl': case 'meirl':