mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-23 11:09:23 +01:00
Updated for the move of standardSubstitute.
This commit is contained in:
parent
e688faf16e
commit
024052b4ab
@ -111,7 +111,7 @@ class Dunno(callbacks.Privmsg):
|
|||||||
if dunno is not None:
|
if dunno is not None:
|
||||||
dunno = dunno.text
|
dunno = dunno.text
|
||||||
prefixName = self.registryValue('prefixNick', channel)
|
prefixName = self.registryValue('prefixNick', channel)
|
||||||
dunno = plugins.standardSubstitute(irc, msg, dunno)
|
dunno = ircutils.standardSubstitute(irc, msg, dunno)
|
||||||
irc.reply(dunno, prefixName=prefixName)
|
irc.reply(dunno, prefixName=prefixName)
|
||||||
|
|
||||||
def add(self, irc, msg, args, user, at, channel, dunno):
|
def add(self, irc, msg, args, user, at, channel, dunno):
|
||||||
|
@ -111,7 +111,7 @@ class Herald(callbacks.Privmsg):
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
default = self.registryValue('default', channel)
|
default = self.registryValue('default', channel)
|
||||||
if default:
|
if default:
|
||||||
default = plugins.standardSubstitute(irc, msg, default)
|
default = ircutils.standardSubstitute(irc, msg, default)
|
||||||
msgmaker = ircmsgs.privmsg
|
msgmaker = ircmsgs.privmsg
|
||||||
if self.registryValue('default.notice', channel):
|
if self.registryValue('default.notice', channel):
|
||||||
msgmaker = ircmsgs.notice
|
msgmaker = ircmsgs.notice
|
||||||
@ -128,7 +128,7 @@ class Herald(callbacks.Privmsg):
|
|||||||
if now - self.lastParts[channel, id] < i:
|
if now - self.lastParts[channel, id] < i:
|
||||||
return
|
return
|
||||||
self.lastHerald[channel, id] = now
|
self.lastHerald[channel, id] = now
|
||||||
herald = plugins.standardSubstitute(irc, msg, herald)
|
herald = ircutils.standardSubstitute(irc, msg, herald)
|
||||||
irc.reply(herald, prefixName=False)
|
irc.reply(herald, prefixName=False)
|
||||||
|
|
||||||
def doPart(self, irc, msg):
|
def doPart(self, irc, msg):
|
||||||
|
@ -336,7 +336,7 @@ class MoobotFactoids(callbacks.Privmsg):
|
|||||||
newfact = newfact[len(self._actionTag):]
|
newfact = newfact[len(self._actionTag):]
|
||||||
type = 'action'
|
type = 'action'
|
||||||
newfact = newfact.strip()
|
newfact = newfact.strip()
|
||||||
newfact = plugins.standardSubstitute(irc, msg, newfact)
|
newfact = ircutils.standardSubstitute(irc, msg, newfact)
|
||||||
return (type, newfact)
|
return (type, newfact)
|
||||||
|
|
||||||
def tokenizedCommand(self, irc, msg, tokens):
|
def tokenizedCommand(self, irc, msg, tokens):
|
||||||
|
@ -100,7 +100,7 @@ def getTopic(irc, msg, args, state, format=True):
|
|||||||
if format:
|
if format:
|
||||||
env = {'topic': topic}
|
env = {'topic': topic}
|
||||||
formatter = state.cb.registryValue('format', state.channel)
|
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)
|
state.args.append(topic)
|
||||||
|
|
||||||
def getTopicNumber(irc, msg, args, state):
|
def getTopicNumber(irc, msg, args, state):
|
||||||
|
@ -107,7 +107,7 @@ class Utilities(callbacks.Privmsg):
|
|||||||
$botnick, $channel, $user, $host, $today, $now, and $randomDate are all
|
$botnick, $channel, $user, $host, $today, $now, and $randomDate are all
|
||||||
handled appropriately.
|
handled appropriately.
|
||||||
"""
|
"""
|
||||||
text = plugins.standardSubstitute(irc, msg, text)
|
text = ircutils.standardSubstitute(irc, msg, text)
|
||||||
irc.reply(text, prefixName=False)
|
irc.reply(text, prefixName=False)
|
||||||
echo = wrap(echo, ['text'])
|
echo = wrap(echo, ['text'])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user