mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-30 14:59:34 +01:00
pipeSyntax is now in supybot.reply AND it's channel-specific .. fixed addAlias
to reflect that
This commit is contained in:
parent
8ab613dbed
commit
c93171012f
@ -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.'
|
||||||
|
Loading…
Reference in New Issue
Block a user