From 301dd7378a77671f00c0b7e2be127f0d72792bae Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 24 Jan 2019 17:12:50 +0000 Subject: Add `irc_lower()` and `irc_equals()` to IRCServer.Server so that no where else in the code has to know about the server having a casemapping --- modules/channel_save.py | 3 +-- modules/karma.py | 3 +-- modules/line_handler.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/channel_save.py b/modules/channel_save.py index 91f069d6..b7b0833f 100644 --- a/modules/channel_save.py +++ b/modules/channel_save.py @@ -23,8 +23,7 @@ class Module(ModuleManager.BaseModule): @utils.hook("self.join") def on_join(self, event): channels = event["server"].get_setting("autojoin", []) - channel_name = utils.irc.lower(event["server"].case_mapping, - event["channel"].name) + channel_name = event["server"].irc_lower(event["channel"].name) if not channel_name in channels: channels.append(channel_name) event["server"].set_setting("autojoin", channels) diff --git a/modules/karma.py b/modules/karma.py index da9cd156..b32c6a59 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -36,8 +36,7 @@ class Module(ModuleManager.BaseModule): if not event["user"].last_karma or (time.time()-event["user" ].last_karma) >= KARMA_DELAY_SECONDS: target = match.group(1).strip() - if utils.irc.lower(event["server"].case_mapping, target - ) == event["user"].name: + if event["server"].irc_lower(target) == event["user"].name: if verbose: self.events.on("send.stderr").call( module_name="Karma", target=event["channel"], diff --git a/modules/line_handler.py b/modules/line_handler.py index eaca23ce..63f29c5d 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -618,8 +618,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 = utils.irc.lower(event["server"].case_mapping, - event["args"][1]) + channel_name = event["server"].irc_lower(event["args"][1]) if channel_name in event["server"].channels: key = event["server"].attempted_join[channel_name] self.timers.add("rejoin", 5, channel_name=channe_name, key=key, -- cgit v1.3.1-10-gc9f91