Compare commits

..

No commits in common. "064b52ad3cb6e4ab1d2c85cf3b7a7e85d134cb7a" and "6dbc9087e1f94180a56f94d814c47d68fb552bbd" have entirely different histories.

3 changed files with 12 additions and 16 deletions

21
bot.js
View File

@ -105,9 +105,17 @@ bot.addListener('message', function(nick, to, text, from) {
var command = args[0].toLowerCase() var command = args[0].toLowerCase()
if (args[0] === '$help') { if (args[0] === '$help') {
help(to); help(to);
} else if (command === config.irc.prefix+'flood') {
flood(to, args)
} else if (command === config.irc.prefix+'sneed') { } else if (command === config.irc.prefix+'sneed') {
sneed(to); sneed(to);
} else if (command === config.irc.prefix+'art') { } else if (command === config.irc.prefix+'ctcpflood') {
ctcp(args[1], args[2], args[3]);
} else if (command === config.irc.prefix+'rspam') {
rspam(to, args[1])
} else if (command === config.irc.prefix+'uspam') {
uspam(to, args[1]);
} else if (command === config.irc.prefix+'art') {
art(to, args[1]); art(to, args[1]);
} else if (command === config.irc.prefix+'godwords') { } else if (command === config.irc.prefix+'godwords') {
godwords(to, args[1]); godwords(to, args[1]);
@ -116,17 +124,6 @@ bot.addListener('message', function(nick, to, text, from) {
} else if (command === config.irc.prefix+'symphish') { } else if (command === config.irc.prefix+'symphish') {
symphish(to, args[1], args[2]) symphish(to, args[1], args[2])
} }
if (config.floodprotect.enable_flood_commands == "true") {
if (command === config.irc.prefix+'flood') {
flood(to, args)
} else if (command === config.irc.prefix+'ctcpflood') {
ctcp(args[1], args[2], args[3]);
} else if (command === config.irc.prefix+'rspam') {
rspam(to, args[1])
} else if (command === config.irc.prefix+'uspam') {
uspam(to, args[1]);
}
}
msgTimeout.add(to); msgTimeout.add(to);
setTimeout(() => { setTimeout(() => {
msgTimeout.delete(to); msgTimeout.delete(to);

View File

@ -55,10 +55,10 @@ if (width > 100) {
} }
if (height == undefined) { if (height == undefined) {
consoleLog('[phish] Height was not specified, defaulting to 5') consoleLog('[phish] Height was not specified, defaulting to 5')
height = 6 height = 5
} }
if (width == undefined) { if (width == undefined) {
consoleLog('[phish] Width was not specified, defaulting to 5') consoleLog('[phish] Width was not specified, defaulting to 5')
width = 10 width = 7
} }
gen(height, width, type) gen(height, width, type)

View File

@ -15,8 +15,7 @@
"floodprotect": { "floodprotect": {
"flood_protection": "false", "flood_protection": "false",
"flood_protection_delay": "0", "flood_protection_delay": "0",
"command_listen_timeout": "2500", "command_listen_timeout": "2500"
"enable_flood_commands": "true"
}, },
"errorhandling": { "errorhandling": {
"error_logging": "true", "error_logging": "true",