aboutsummaryrefslogtreecommitdiff
path: root/src/IRCLineHandler.py
diff options
context:
space:
mode:
authorGravatar jesopo2018-09-28 16:51:36 +0100
committerGravatar jesopo2018-09-28 16:51:36 +0100
commita8bf3c93007503ec411d0d23fef021f386127fa5 (patch)
tree4aa2c0d367606bd4c5e9ff3a0dda75a59267beb3 /src/IRCLineHandler.py
parentFix typo in database_backup.py, 'ocation' -> 'location' (diff)
signature
Remove cyclical references to IRCBot
Diffstat (limited to 'src/IRCLineHandler.py')
-rw-r--r--src/IRCLineHandler.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/IRCLineHandler.py b/src/IRCLineHandler.py
index 7d2336dc..805daa20 100644
--- a/src/IRCLineHandler.py
+++ b/src/IRCLineHandler.py
@@ -14,9 +14,9 @@ CAPABILITIES = {"multi-prefix", "chghost", "invite-notify", "account-tag",
"batch", "draft/labeled-response"}
class LineHandler(object):
- def __init__(self, bot, events):
- self.bot = bot
+ def __init__(self, events, timers):
self.events = events
+ self.timers = timers
events.on("raw.PING").hook(self.ping)
events.on("raw.001").hook(self.handle_001, default_event=True)
@@ -570,10 +570,9 @@ class LineHandler(object):
# we need a registered nickname for this channel
def handle_477(self, event):
channel_name = Utils.irc_lower(event["server"], event["args"][1])
- if channel_name in event["server"].attempted_join:
- self.bot.add_timer("rejoin", 5,
- channel_name=event["args"][1],
- key=event["server"].attempted_join[channel_name],
+ if channel_name in event["server"]:
+ key = event["server"].attempted_join[channel_name]
+ self.timers.add("rejoin", 5, channel_name=channe_name, key=key,
server_id=event["server"].id)
# someone's been kicked from a channel