From eeacd8bd223dce186e610f9a202fb691bfba3b14 Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Sat, 31 Jul 2004 04:52:50 +0000
Subject: [PATCH] Fixed the issue with responding when he shouldn't be by
 making try:finally one fat bastard.

---
 plugins/Infobot.py | 67 +++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/plugins/Infobot.py b/plugins/Infobot.py
index c89788a5b..9b25972aa 100755
--- a/plugins/Infobot.py
+++ b/plugins/Infobot.py
@@ -245,40 +245,41 @@ class Infobot(callbacks.PrivmsgCommandAndRegexp):
 
     _forceRe = re.compile(r'^no[,: -]+', re.I)
     def doPrivmsg(self, irc, msg):
-        if ircmsgs.isCtcp(msg):
-            return
-        maybeAddressed = callbacks.addressed(irc.nick, msg,
-                                             whenAddressedByNick=True)
-        if maybeAddressed:
-            self.addressed = True
-            payload = maybeAddressed
-        else:
-            payload = msg.args[1]
-        payload = self.normalize(payload)
-        maybeForced = self._forceRe.sub('', payload)
-        if maybeForced != payload:
-            self.force = True
-            payload = maybeForced
-        # Let's make sure we dump out of Infobot if the privmsg is an actual
-        # command otherwise we could get multiple responses.
-        if self.addressed:
-            try:
-                tokens = callbacks.tokenize(payload)
-                getCallback = callbacks.findCallbackForCommand
-                commands = filter(None, map(lambda c, i=irc: getCallback(i, c),
-                                            tokens))
-                if commands:
-                    return
-                else:
-                    payload += '?'
-            except SyntaxError:
-                pass
-        if payload.endswith(irc.nick):
-            self.addressed = True
-            payload = payload[:-len(irc.nick)]
-            payload = payload.strip(', ') # Strip punctuation separating nick.
-            payload += '?' # So doUnknown gets called.
         try:
+            if ircmsgs.isCtcp(msg):
+                return
+            maybeAddressed = callbacks.addressed(irc.nick, msg,
+                                                 whenAddressedByNick=True)
+            if maybeAddressed:
+                self.addressed = True
+                payload = maybeAddressed
+            else:
+                payload = msg.args[1]
+            payload = self.normalize(payload)
+            maybeForced = self._forceRe.sub('', payload)
+            if maybeForced != payload:
+                self.force = True
+                payload = maybeForced
+            # Let's make sure we dump out of Infobot if the privmsg is an
+            # actual command otherwise we could get multiple responses.
+            if self.addressed:
+                try:
+                    tokens = callbacks.tokenize(payload)
+                    getCallback = callbacks.findCallbackForCommand
+                    commands = filter(None,
+                                      map(lambda c, i=irc: getCallback(i, c),
+                                          tokens))
+                    if commands:
+                        return
+                    else:
+                        payload += '?'
+                except SyntaxError:
+                    pass
+            if payload.endswith(irc.nick):
+                self.addressed = True
+                payload = payload[:-len(irc.nick)]
+                payload = payload.strip(', ') # Strip punctuation separating nick.
+                payload += '?' # So doUnknown gets called.
             msg = ircmsgs.privmsg(msg.args[0], payload, prefix=msg.prefix)
             callbacks.PrivmsgCommandAndRegexp.doPrivmsg(self, irc, msg)
         finally: