LBRYFoundation/lbry-wunderbot
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-wunderbot.git synced 2025-09-01 09:45:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #91 from nikooo777/master

Browse source 
fixed crash in bot
This commit is contained in:
filipnyquist 2017-11-17 22:44:37 +01:00 • committed by GitHub
commit b5d144111e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
bot/helpers.js
View file

@ -8,72 +8,40 @@ let statsBotChannels = config.get("statsbot");
// Checks if user is allowed to use a command only for mods/team members // Checks if user is allowed to use a command only for mods/team members
exports.hasPerms = function(msg) { exports.hasPerms = function(msg) {
if (msg.member.roles.some(r => permRanks.perms.includes(r.name))) { return msg.member.roles.some(r => permRanks.perms.includes(r.name));
return true;
} else {
return false;
}
}; };
// Check if command was sent in dm // Check if command was sent in dm
exports.inPrivate = function(msg) { exports.inPrivate = function(msg) {
if (msg.channel.type == "dm") { return msg.channel.type == "dm";
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a channel in speechBot Channels list // Checks if Message was sent from a channel in speechBot Channels list
exports.hasSpeechBotChannels = function(msg) { exports.hasSpeechBotChannels = function(msg) {
if (speechBotChannels.channels.includes(msg.channel.id)) { return speechBotChannels.channels.includes(msg.channel.id);
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a channel in priceBot Channels list // Checks if Message was sent from a channel in priceBot Channels list
exports.hasPriceBotChannels = function(msg) { exports.hasPriceBotChannels = function(msg) {
if (priceBotChannels.channels.includes(msg.channel.id)) { return priceBotChannels.channels.includes(msg.channel.id);
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a Excluded channel // Checks if Message was sent from a Excluded channel
exports.hasExcludedSpamChannels = function(msg) { exports.hasExcludedSpamChannels = function(msg) {
if (ExcludedSpam.channels.includes(msg.channel.id)) { return ExcludedSpam.channels.includes(msg.channel.id);
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a Excluded user // Checks if Message was sent from a Excluded user
exports.hasExcludedSpamUsers = function(msg) { exports.hasExcludedSpamUsers = function(msg) {
if (ExcludedSpam.users.includes(msg.author.id)) { return ExcludedSpam.users.includes(msg.author.id);
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a channel in hashBot Channels list // Checks if Message was sent from a channel in hashBot Channels list
exports.hasHashBotChannels = function(msg) { exports.hasHashBotChannels = function(msg) {
if (hashBotChannels.channels.includes(msg.channel.id)) { return hashBotChannels.channels.includes(msg.channel.id);
return true;
} else {
return false;
}
}; };
// Checks if Message was sent from a channel in statsBot Channels list // Checks if Message was sent from a channel in statsBot Channels list
exports.hasStatsBotChannels = function(msg) { exports.hasStatsBotChannels = function(msg) {
if (statsBotChannels.channels.includes(msg.channel.id)) { retrun(statsBotChannels.channels.includes(msg.channel.id));
return true;
} else {
return false;
}
}; };

2
bot/modules/spam-detection.js
View file

@ -31,8 +31,8 @@ exports.antiSpam = function(bot) {
bot.on("message", msg => { bot.on("message", msg => {
if ( if (
inPrivate(msg) || inPrivate(msg) ||
hasPerms(msg) ||
msg.author.bot || msg.author.bot ||
hasPerms(msg) ||
hasExcludedSpamChannels(msg) || hasExcludedSpamChannels(msg) ||
hasExcludedSpamUsers(msg) hasExcludedSpamUsers(msg)
) { ) {