diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/line_handler/__init__.py | 6 | ||||
| -rw-r--r-- | modules/line_handler/channel.py | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/modules/line_handler/__init__.py b/modules/line_handler/__init__.py index 20361483..0df30109 100644 --- a/modules/line_handler/__init__.py +++ b/modules/line_handler/__init__.py @@ -247,11 +247,7 @@ class Module(ModuleManager.BaseModule): # we need a registered nickname for this channel @utils.hook("raw.received.477", default_event=True) def handle_477(self, event): - channel_name = event["server"].irc_lower(event["line"].args[1]) - if not channel_name in event["server"].channels: - key = event["server"].attempted_join[channel_name] - self.timers.add("rejoin", 5, channel_name=channe_name, key=key, - server_id=event["server"].id) + channel.handle_477(self.timers, event) # someone's been kicked from a channel @utils.hook("raw.received.kick") diff --git a/modules/line_handler/channel.py b/modules/line_handler/channel.py index 77091206..2521beed 100644 --- a/modules/line_handler/channel.py +++ b/modules/line_handler/channel.py @@ -90,8 +90,6 @@ def join(events, event): user.join_channel(channel) if is_self: - if channel.name in event["server"].attempted_join: - del event["server"].attempted_join[channel.name] events.on("self.join").call(channel=channel, server=event["server"], account=account, realname=realname) channel.send_mode() @@ -132,11 +130,7 @@ def handle_329(event): channel.creation_timestamp = int(event["line"].args[2]) def handle_477(timers, event): - channel_name = event["server"].irc_lower(event["line"].args[1]) - if channel_name in event["server"].channels: - key = event["server"].attempted_join[channel_name] - timers.add("rejoin", 5, channel_name=channe_name, key=key, - server_id=event["server"].id) + pass def kick(events, event): user = event["server"].get_user(event["line"].source.nickname) |