From 27cd893dbdd01cc88a37b857fdf1b357e2a4526f Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Mon, 26 Apr 2004 15:35:56 +0000 Subject: [PATCH] Make sure we don't take revenge on ourselves. --- plugins/Enforcer.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/Enforcer.py b/plugins/Enforcer.py index c9673e49d..845819f58 100644 --- a/plugins/Enforcer.py +++ b/plugins/Enforcer.py @@ -162,8 +162,14 @@ class Enforcer(callbacks.Privmsg): return False # Default. def _revenge(self, irc, channel, hostmask): - irc.queueMsg(ircmsgs.ban(channel, ircutils.banmask(hostmask))) - irc.queueMsg(ircmsgs.kick(channel,ircutils.nickFromHostmask(hostmask))) + nick = ircutils.nickFromHostmask(hostmask) + if irc.nick != nick: + irc.queueMsg(ircmsgs.ban(channel, ircutils.banmask(hostmask))) + irc.queueMsg(ircmsgs.kick(channel, nick)) + else: + # This can happen if takeRevengeOnOps is True. + self.log.info('Tried to take revenge on myself. ' + 'Are you sure you want takeRevengeOnOps to be True?') def doKick(self, irc, msg): channel = msg.args[0]