AutoMode: Prevent traceback if a unregistered user joins.

progval · Sep 22, 2012 · dfbf74b · dfbf74b
1 parent ae2f813
commit dfbf74b
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/plugins/AutoMode/plugin.py b/plugins/AutoMode/plugin.py
@@ -87,15 +87,11 @@ def f():
                 schedule.addEvent(f, time.time() + delay)
             else:
                 f()
-        try:
+        def extra_modes():
-            do('op')
+            try:
-            if 'h' in irc.state.supported['prefix']:
+                user = ircdb.users.getUser(ircdb.users.getUserId(msg.prefix))
-                do('halfop')
+            except KeyError:
-            do('voice')
+                return
-        except Continue:
-            return
-        finally:
-            user = ircdb.users.getUser(ircdb.users.getUserId(msg.prefix))
             pattern = re.compile('-|\+')
             for item in self.registryValue('extra', channel):
                 try:
@@ -114,6 +110,15 @@ def f():
                             ([msg.nick]*len(pattern.sub('', modes)))
                     schedule_msg(ircmsgs.mode(channel, modes), lambda :False)
                     break
+        try:
+            do('op')
+            if 'h' in irc.state.supported['prefix']:
+                do('halfop')
+            do('voice')
+        except Continue:
+            return
+        finally:
+            extra_modes()
         c = ircdb.channels.getChannel(channel)
         if c.checkBan(msg.prefix) and self.registryValue('ban', channel):
             period = self.registryValue('ban.period', channel)