pipeSyntax is now in supybot.reply AND it's channel-specific .. fixed addAlias

to reflect that
This commit is contained in:
Daniel DiPaolo 2004-05-10 22:14:54 +00:00
parent 8ab613dbed
commit c93171012f

View File

@ -221,7 +221,8 @@ class Alias(callbacks.Privmsg):
def addAlias(self, irc, name, alias, lock=False): def addAlias(self, irc, name, alias, lock=False):
if self._invalidCharsRe.search(name): if self._invalidCharsRe.search(name):
raise AliasError, 'Names cannot contain spaces or square brackets.' raise AliasError, 'Names cannot contain spaces or square brackets.'
if conf.supybot.pipeSyntax() and '|' in name: channel = privmsgs.getChannel(irc.msg, irc.args)
if conf.supybot.reply.pipeSyntax.get(channel)() and '|' in name:
raise AliasError, 'Names cannot contain pipes.' raise AliasError, 'Names cannot contain pipes.'
if irc.getCallback(name): if irc.getCallback(name):
raise AliasError, 'Names cannot coincide with names of plugins.' raise AliasError, 'Names cannot coincide with names of plugins.'