diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/karma.py | 2 | ||||
| -rw-r--r-- | modules/line_handler.py | 3 | ||||
| -rw-r--r-- | modules/sed.py | 13 |
3 files changed, 11 insertions, 7 deletions
diff --git a/modules/karma.py b/modules/karma.py index 441b061e..d3bab796 100644 --- a/modules/karma.py +++ b/modules/karma.py @@ -27,7 +27,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"], target + if utils.irc.lower(event["server"].case_mapping, target ) == event["user"].name: if verbose: self.events.on("send.stderr").call( diff --git a/modules/line_handler.py b/modules/line_handler.py index da0d5d07..3ee8304b 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -542,7 +542,8 @@ class Module(ModuleManager.BaseModule): # we need a registered nickname for this channel @utils.hook("raw.477", default_event=True) def handle_477(self, event): - channel_name = utils.irc.lower(event["server"], event["args"][1]) + channel_name = utils.irc.lower(event["server"].case_mapping, + event["args"][1]) if channel_name in event["server"]: key = event["server"].attempted_join[channel_name] self.timers.add("rejoin", 5, channel_name=channe_name, key=key, diff --git a/modules/sed.py b/modules/sed.py index 6de7b4af..7b98ab70 100644 --- a/modules/sed.py +++ b/modules/sed.py @@ -11,12 +11,16 @@ REGEX_SED = re.compile("^s/") "help": "Disable/Enable sed only looking at the messages sent by the user", "validate": utils.bool_or_none}) class Module(ModuleManager.BaseModule): + def _closest_setting(self, event, setting, default): + return event["channel"].get_setting(setting, + event["server"].get_setting(setting, default)) + @utils.hook("received.message.channel") def channel_message(self, event): sed_split = re.split(REGEX_SPLIT, event["message"], 3) if event["message"].startswith("s/") and len(sed_split) > 2: - if event["action"] or not utils.get_closest_setting( - event, "sed", False): + if event["action"] or not self._closest_setting(event, "sed", + False): return regex_flags = 0 @@ -48,9 +52,8 @@ class Module(ModuleManager.BaseModule): return replace = sed_split[2].replace("\\/", "/") - for_user = event["user"].nickname if utils.get_closest_setting( - event, "sed-sender-only", False - ) else None + for_user = event["user"].nickname if self._closest_setting(event, + "sed-sender-only", False) else None line = event["channel"].buffer.find(pattern, from_self=False, for_user=for_user, not_pattern=REGEX_SED) if line: |