LBRYCommunity/lbry-tipbot
1
0
Fork 0
Code Issues 4 Pull requests 4 Projects Releases Packages Wiki Activity

Fix : Use RegEx based splitting instead of space character #62

Merged
Eniamza merged 2 commits from master into master 2021-04-20 22:17:47 +02:00
Conversation 1 Commits 2 Files changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bot.ts
View file

@ -23,11 +23,11 @@ bot.on('message', msg => {
//check if message is a command //check if message is a command
if (msg.author.id !== bot.user.id && msg.content.startsWith(botConfig.prefix)) { if (msg.author.id !== bot.user.id && msg.content.startsWith(botConfig.prefix)) {
console.log(`treating ${msg.content} from ${msg.author} as command`); 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 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)) { if (msg.mentions.has(bot.user)) {
try { 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); suffix = msg.content.substring(bot.user.toString().length + cmdTxt.length + botConfig.prefix.length + 1);
} catch (e) { } catch (e) {
//no command //no command

6
src/modules/tipbot.ts
View file

@ -35,7 +35,7 @@ exports.tip = {
let tipper = msg.author.id, let tipper = msg.author.id,
words = msg.content words = msg.content
.trim() .trim()
.split(' ') .split(/ +/)
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}), }),
@ -68,7 +68,7 @@ exports.multitip = {
let tipper = msg.author.id.replace('!', ''), let tipper = msg.author.id.replace('!', ''),
words = msg.content words = msg.content
.trim() .trim()
.split(' ') .split(/ +/)
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}), }),
@ -93,7 +93,7 @@ exports.roletip = {
let tipper = msg.author.id.replace('!', ''), let tipper = msg.author.id.replace('!', ''),
words = msg.content words = msg.content
.trim() .trim()
.split(' ') .split(/ +/)
.filter(function(n) { .filter(function(n) {
return n !== ''; return n !== '';
}), }),