diff --git a/src/bot.ts b/src/bot.ts index e232669..46d0e8b 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -23,11 +23,11 @@ bot.on('message', msg => { //check if message is a command if (msg.author.id !== bot.user.id && msg.content.startsWith(botConfig.prefix)) { console.log(`treating ${msg.content} from ${msg.author} as command`); - let cmdTxt = msg.content.split(' ')[0].substring(botConfig.prefix.length); + let cmdTxt = msg.content.split(/ +/)[0].substring(botConfig.prefix.length); let suffix = msg.content.substring(cmdTxt.length + botConfig.prefix.length + 1); //add one for the ! and one for the space if (msg.mentions.has(bot.user)) { try { - cmdTxt = msg.content.split(' ')[1]; + cmdTxt = msg.content.split(/ +/)[1]; suffix = msg.content.substring(bot.user.toString().length + cmdTxt.length + botConfig.prefix.length + 1); } catch (e) { //no command diff --git a/src/modules/tipbot.ts b/src/modules/tipbot.ts index ac57b0a..0e17545 100644 --- a/src/modules/tipbot.ts +++ b/src/modules/tipbot.ts @@ -35,7 +35,7 @@ exports.tip = { let tipper = msg.author.id, words = msg.content .trim() - .split(' ') + .split(/ +/) .filter(function(n) { return n !== ''; }), @@ -68,7 +68,7 @@ exports.multitip = { let tipper = msg.author.id.replace('!', ''), words = msg.content .trim() - .split(' ') + .split(/ +/) .filter(function(n) { return n !== ''; }), @@ -93,7 +93,7 @@ exports.roletip = { let tipper = msg.author.id.replace('!', ''), words = msg.content .trim() - .split(' ') + .split(/ +/) .filter(function(n) { return n !== ''; }),