diff --git a/plugins/Dunno.py b/plugins/Dunno.py index 91f11ff3d..15f2cd5e3 100644 --- a/plugins/Dunno.py +++ b/plugins/Dunno.py @@ -111,7 +111,7 @@ class Dunno(callbacks.Privmsg): if dunno is not None: dunno = dunno.text prefixName = self.registryValue('prefixNick', channel) - dunno = plugins.standardSubstitute(irc, msg, dunno) + dunno = ircutils.standardSubstitute(irc, msg, dunno) irc.reply(dunno, prefixName=prefixName) def add(self, irc, msg, args, user, at, channel, dunno): diff --git a/plugins/Herald.py b/plugins/Herald.py index e1280b1d0..ea100d7b6 100644 --- a/plugins/Herald.py +++ b/plugins/Herald.py @@ -111,7 +111,7 @@ class Herald(callbacks.Privmsg): except KeyError: default = self.registryValue('default', channel) if default: - default = plugins.standardSubstitute(irc, msg, default) + default = ircutils.standardSubstitute(irc, msg, default) msgmaker = ircmsgs.privmsg if self.registryValue('default.notice', channel): msgmaker = ircmsgs.notice @@ -128,7 +128,7 @@ class Herald(callbacks.Privmsg): if now - self.lastParts[channel, id] < i: return self.lastHerald[channel, id] = now - herald = plugins.standardSubstitute(irc, msg, herald) + herald = ircutils.standardSubstitute(irc, msg, herald) irc.reply(herald, prefixName=False) def doPart(self, irc, msg): diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py index a815f6570..078477fc7 100644 --- a/plugins/MoobotFactoids.py +++ b/plugins/MoobotFactoids.py @@ -336,7 +336,7 @@ class MoobotFactoids(callbacks.Privmsg): newfact = newfact[len(self._actionTag):] type = 'action' newfact = newfact.strip() - newfact = plugins.standardSubstitute(irc, msg, newfact) + newfact = ircutils.standardSubstitute(irc, msg, newfact) return (type, newfact) def tokenizedCommand(self, irc, msg, tokens): diff --git a/plugins/Topic.py b/plugins/Topic.py index 96aa1f4f8..b932dfbeb 100644 --- a/plugins/Topic.py +++ b/plugins/Topic.py @@ -100,7 +100,7 @@ def getTopic(irc, msg, args, state, format=True): if format: env = {'topic': topic} formatter = state.cb.registryValue('format', state.channel) - topic = plugins.standardSubstitute(irc, msg, formatter, env) + topic = ircutils.standardSubstitute(irc, msg, formatter, env) state.args.append(topic) def getTopicNumber(irc, msg, args, state): diff --git a/plugins/Utilities.py b/plugins/Utilities.py index 7ed0e15f7..b4eb3c28e 100644 --- a/plugins/Utilities.py +++ b/plugins/Utilities.py @@ -107,7 +107,7 @@ class Utilities(callbacks.Privmsg): $botnick, $channel, $user, $host, $today, $now, and $randomDate are all handled appropriately. """ - text = plugins.standardSubstitute(irc, msg, text) + text = ircutils.standardSubstitute(irc, msg, text) irc.reply(text, prefixName=False) echo = wrap(echo, ['text'])