diff options
Diffstat (limited to 'src/core_modules')
| -rw-r--r-- | src/core_modules/line_handler/__init__.py | 9 | ||||
| -rw-r--r-- | src/core_modules/line_handler/core.py | 8 | ||||
| -rw-r--r-- | src/core_modules/mode_lists.py | 21 |
3 files changed, 25 insertions, 13 deletions
diff --git a/src/core_modules/line_handler/__init__.py b/src/core_modules/line_handler/__init__.py index ddea6fdc..6f99d763 100644 --- a/src/core_modules/line_handler/__init__.py +++ b/src/core_modules/line_handler/__init__.py @@ -216,15 +216,20 @@ class Module(ModuleManager.BaseModule): user.account(self.events, event) # response to a WHO command for user information - @utils.hook("raw.received.352", default_event=True) + @utils.hook("raw.received.352") def handle_352(self, event): core.handle_352(self.events, event) # response to a WHOX command for user information, including account name - @utils.hook("raw.received.354", default_event=True) + @utils.hook("raw.received.354") def handle_354(self, event): core.handle_354(self.events, event) + # RPLENDOFWHO + @utils.hook("raw.received.315") + def handle_315(self, event): + core.handle_315(self.events, event) + # response to an empty mode command @utils.hook("raw.received.324") def handle_324(self, event): diff --git a/src/core_modules/line_handler/core.py b/src/core_modules/line_handler/core.py index c72bcb77..c69e662d 100644 --- a/src/core_modules/line_handler/core.py +++ b/src/core_modules/line_handler/core.py @@ -150,6 +150,14 @@ def handle_354(events, event): events.on("received.whox").call(server=event["server"], user=target) +def handle_315(events, event): + target = event["line"].args[1] + if target in event["server"].channels: + channel = event["server"].channels.get(target) + events.on("received.endofwho").call(server=event["server"], + channel=channel) + channel.seen_who = True + def _nick_in_use(server): new_nick = "%s|" % server.connection_params.nickname server.send_nick(new_nick) diff --git a/src/core_modules/mode_lists.py b/src/core_modules/mode_lists.py index d1bc3a14..ed73d80e 100644 --- a/src/core_modules/mode_lists.py +++ b/src/core_modules/mode_lists.py @@ -75,19 +75,18 @@ class Module(ModuleManager.BaseModule): self._mask_add(event["channel"], mode[1], arg) else: self._mask_remove(event["channel"], mode[1], arg) + elif mode[1] in dict(event["server"].prefix_modes): + if (event["server"].irc_equals(event["server"].nickname, arg) + and event["channel"].seen_who): + self._query_lists(event["server"], event["channel"]) - @utils.hook("received.315") - def who_end(self, event): - channel = self._channel(event) - if channel: - missed = set(event["server"].channel_list_modes)-set( - channel.mode_lists.keys()) - if missed: - channel.send_mode("+%s" % "".join(missed)) + def _query_lists(self, server, channel): + seen = set(k.lstrip("~") for k in channel.mode_lists.keys()) + missing = set(server.channel_list_modes)-seen + if missing: + channel.send_mode("+%s" % "".join(missing)) @utils.hook("self.join") def self_join(self, event): - event["channel"].send_mode("+%s" % - "".join(event["server"].channel_list_modes)) - + self._query_lists(event["server"], event["channel"]) |