From d9b2aa98bf593a257df7293b0131ee54af727857 Mon Sep 17 00:00:00 2001 From: Daniel Tam Date: Thu, 13 Dec 2018 00:11:45 -0600 Subject: [PATCH] added summon as default case --- bot.js | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/bot.js b/bot.js index e563c93..c9d2904 100644 --- a/bot.js +++ b/bot.js @@ -644,17 +644,24 @@ client.on('message', message => { case 'smn': case 'summn': case 'summon': + default: try { // Dalton's image summon command. // Checks for banned author's using a hard coded list of discord ids. // Also rudely cleans garbage entries. let is_banned = isAuthorBanned(message.author.id); if (!is_banned) { - + + let request_item = ""; let messageSplit = message.content.substring(2).split(' '); if (messageSplit.length === 2) { - let requested_item = messageSplit[1].replace(/[^a-zA-Z0-9_\-]+/g, ''); + requested_item = messageSplit[1].replace(/[^a-zA-Z0-9_\-]+/g, ''); + } + else + requested_item = message.content.substring(message.content.indexOf(' ') + 1); + if(messageSplit[1] !== undefined) + { // Valid Argument let link = asyncImageRequest(requested_item) .then(link => message.channel.send(link)) @@ -663,18 +670,8 @@ client.on('message', message => { console.error('promise:' + JSON.stringify(link)); }); //sendToBotTestingChannel('link promise: ' + JSON.stringify(link)); - } else if (messageSplit.length > 2) { - // todo handle more entries - //message.channel.send(message.author + ' summons ' + message.content.substring(9) + '\n'); - //let imgur_terms = encodeURIComponent(message.content.substring(9).trim()); - //let imgur_response = imgurRequest(imgur_terms, 5); - //message.channel.send('imgur:' + imgur_response); - //if (imgur_response) { - // return imgur_response - //} - //message.channel.send(imgur_response); - - } else { + } + else { // Missing Argument message.reply('wut do i summon?'); }