Updated for the move of standardSubstitute.

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):

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):

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):

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):

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'])