diff --git a/modules/kick/commands.js b/modules/kick/commands.js index 31b6848..5a719c1 100644 --- a/modules/kick/commands.js +++ b/modules/kick/commands.js @@ -139,6 +139,12 @@ var commands = function(dbot) { network = this.config.network_name[event.server]; } + // Ban from current channel first + this.api.ban(server, host, event.channel); + this.api.kick(server, banee, event.channel, reason + + ' (network-wide ban requested by ' + banner + ')'); + channels = _.without(channels, event.channel); + dbot.api.nickserv.getUserHost(event.server, banee, function(host) { // Add host record entry if(host) { @@ -217,12 +223,6 @@ var commands = function(dbot) { // Ban the user from all channels - // Ban from current channel first - this.api.ban(server, host, event.channel); - this.api.kick(server, banee, event.channel, reason + - ' (network-wide ban requested by ' + banner + ')'); - channels = _.without(channels, event.channel); - var i = 0; var banChannel = function(channels) { if(i >= channels.length) return;