From 546a40ccfb6ee1ad939a106e963650d032e82a1e Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Sat, 28 Apr 2012 03:12:00 +1200 Subject: [PATCH] Oops --- plugins/misc.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/misc.py b/plugins/misc.py index cc4707e..3cf4d08 100755 --- a/plugins/misc.py +++ b/plugins/misc.py @@ -17,16 +17,6 @@ def invite(paraml, conn=None): return None -# Rejoin on kick (Configurable, defaults to False) -@hook.event('KICK') -def rejoin(paraml, conn=None): - auto_rejoin = conn.conf.get('auto_rejoin', False) - if autorejoin: - conn.join(paraml[0]) - else: - return None - - # Identify to NickServ (or other service) @hook.event('004') def onjoin(paraml, conn=None, bot=None): @@ -58,6 +48,11 @@ def onkick(paraml, conn=None, chan=None): # if the bot has been kicked, remove from the channel list if paraml[1] == conn.nick: conn.channels.remove(chan) + auto_rejoin = conn.conf.get('auto_rejoin', False) + if auto_rejoin: + conn.join(paraml[0]) + else: + return None @hook.singlethread @hook.event('004')