diff --git a/modules/kick/commands.js b/modules/kick/commands.js index 577cc58..a0dc38b 100644 --- a/modules/kick/commands.js +++ b/modules/kick/commands.js @@ -23,7 +23,11 @@ var commands = function(dbot) { var vStatus = dbot.instance.connections[server].channels[channel].nicks[quietee].voice; dbot.api.timers.addTimeout(msTimeout, function() { if(_.has(this.hosts[server], quietee)) { - this.api.unquiet(server, this.hosts[server][quietee], channel); + if(_.include(this.config.quietBans, channel)) { + this.api.unban(server, this.hosts[server][quietee], channel); + } else { + this.api.unquiet(server, this.hosts[server][quietee], channel); + } if(vStatus === true) { this.api.voice(server, quietee, channel); } @@ -62,7 +66,12 @@ var commands = function(dbot) { if(dbot.instance.connections[server].channels[channel].nicks[quietee].voice === true) { this.api.devoice(server, quietee, channel); } - this.api.quiet(server, host, channel); + + if(_.include(this.config.quietBans, channel)) { + this.api.ban(server, this.hosts[server][quietee], channel); + } else { + this.api.quiet(server, host, channel); + } if(reason.indexOf('#warn') !== -1) { dbot.api.warning.warn(server, event.rUser, quietee, diff --git a/modules/kick/config.json b/modules/kick/config.json index 81dec3b..0b68ac7 100644 --- a/modules/kick/config.json +++ b/modules/kick/config.json @@ -3,6 +3,9 @@ "dependencies": [ "command", "report", "users" ], "ignorable": true, "countSilently": true, + "quietBans": [ + "#wherever" + ], "network_name": { "aberwiki": "OAOSIDL" },