aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlee14 <alee14498@gmail.com>2017-06-13 12:28:31 -0400
committerAlee14 <alee14498@gmail.com>2017-06-13 12:28:31 -0400
commitaa745d7a3bd15155853de5e53ac9292f93a533eb (patch)
tree4c955a873d89f7af097de8db8812f2f9ea67418f
parent15d2513ca69fc92d50696876ce9492612e691d74 (diff)
downloadAleeBot-aa745d7a3bd15155853de5e53ac9292f93a533eb.tar.gz
AleeBot-aa745d7a3bd15155853de5e53ac9292f93a533eb.tar.bz2
AleeBot-aa745d7a3bd15155853de5e53ac9292f93a533eb.zip
Updating things
-rw-r--r--aleebot.js4
-rw-r--r--aleemod.js8
2 files changed, 11 insertions, 1 deletions
diff --git a/aleebot.js b/aleebot.js
index 8bc679c..1620d38 100644
--- a/aleebot.js
+++ b/aleebot.js
@@ -161,6 +161,10 @@ client.on('message', message => {
});
+ process.on('unhandledRejection', function(err, p) {
+ console.log("[ERROR | UNCAUGHT PROMISE] " + err.stack);
+});
+
client.login (config.token).catch(function() {
console.log("[ERROR] Login failed.");
});
diff --git a/aleemod.js b/aleemod.js
index 4d6cbce..a45a2bb 100644
--- a/aleemod.js
+++ b/aleemod.js
@@ -139,7 +139,7 @@ client.user.setPresence(presence);
}
if (expletiveFilter) {
- var exp = msg.search(/(\s|^)(shit|shite|shitty|bullshit|fuck|fucking|ass|penis|cunt|faggot|damn|wank|wanker|nigger|bastard|piss|vagina|thisisnotarealwordbutatestword|aleesucks|hentai|asl|a55|anal|ballsack|bong|cocaine|cum|dick|dp|pedo|pube|rape|scat|semen|testes|tits|anus|arse|bitch|b1tch|b17ch|boob|cock|foreskin|hardon|horny|porn|wtf|masturbating|raping|fucked|kys)(\s|$)/i);
+ var exp = msg.search(/(\s|^)(shit|shite|shitty|bullshit|fuck|fucking|ass|penis|cunt|faggot|damn|wank|wanker|nigger|bastard|piss|vagina|thisisnotarealwordbutatestword|aleesucks|hentai|asl|a55|anal|ballsack|bong|cocaine|cum|dick|dp|pedo|pube|rape|scat|semen|testes|tits|anus|arse|bitch|b1tch|b17ch|boob|cock|foreskin|hardon|horny|porn|wtf|masturbating|raping|fucked|kys|fucks)(\s|$)/i);
if (exp != -1) { //Gah! They're not supposed to say that!
switch (Math.floor(Math.random() * 1000) % 5) {
case 0:
@@ -157,6 +157,8 @@ client.user.setPresence(presence);
case 4:
message.reply("Stop flipping breaking the rules. THIS IS ME: :angry:");
break;
+ case 5:
+ message.reply("AleeBot says to stop swearing/being gross or else trouble!");
}
message.delete();
return;
@@ -203,6 +205,10 @@ client.user.setPresence(presence);
client.on('guildMemberAdd', usr => {
});
+ process.on('unhandledRejection', function(err, p) {
+ console.log("[ERROR | UNCAUGHT PROMISE] " + err.stack);
+});
+
client.login(config.token).catch(function() {
console.log("[ERROR] Login failed.");
});