Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

Okay, previous fix was super-dumb so for now I'm making it just not allow pipes

Browse Source 
in aliases at all, though we may decide to change that later.
This commit is contained in:
Daniel DiPaolo 2004-05-11 04:37:26 +00:00
parent 98d03ad063
commit ebaecbf665
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Alias.py
View File

@ -179,7 +179,7 @@ class Alias(callbacks.Privmsg):
# with an Irc, we add our aliases and then delete ourselves :) # with an Irc, we add our aliases and then delete ourselves :)
for (alias, (command, locked)) in self.aliases.iteritems(): for (alias, (command, locked)) in self.aliases.iteritems():
try: try:
self.addAlias(irc, alias, command, locked) self.addAlias(irc, msg, alias, command, locked)
except Exception, e: except Exception, e:
self.log.exception('Exception when trying to add alias %s. ' self.log.exception('Exception when trying to add alias %s. '
'Removing from the Alias database.' % alias) 'Removing from the Alias database.' % alias)
@ -218,11 +218,10 @@ class Alias(callbacks.Privmsg):
unlock = privmsgs.checkCapability(unlock, 'admin') unlock = privmsgs.checkCapability(unlock, 'admin')
_invalidCharsRe = re.compile(r'[\[\]\s]') _invalidCharsRe = re.compile(r'[\[\]\s]')
def addAlias(self, irc, name, alias, lock=False): def addAlias(self, irc, msg, 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.'
channel = privmsgs.getChannel(irc.msg, irc.args) if '|' in name:
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.'
@ -271,7 +270,7 @@ class Alias(callbacks.Privmsg):
Defines an alias <name> that executes <alias>. The <alias> Defines an alias <name> that executes <alias>. The <alias>
should be in the standard "command argument [nestedcommand argument]" should be in the standard "command argument [nestedcommand argument]"
format. $[digit] (like $1, $2, etc.) can be used to represent arguments to the alias; they'll be filled with the first, second, etc.
arguments to the alias; they'll be filled with the first, second, etc. arguments to the alias; they'll be filled with the first, second, etc.
arguments. @1, @2 can be used for optional arguments. $* simply arguments. @1, @2 can be used for optional arguments. $* simply
means "all remaining arguments," and cannot be combined with optional means "all remaining arguments," and cannot be combined with optional