Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bug #711056

This commit is contained in:
Jeremy Fincher 2003-04-01 05:39:36 +00:00
parent e06f07d402
commit a54020ad59
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/callbacks.py
View File

@ -231,15 +231,27 @@ class IrcObjectProxy:
def finalEval(self): def finalEval(self):
self.finalEvaled = True self.finalEvaled = True
name = self.args.pop(0) name = canonicalName(self.args.pop(0))
callback = self.findCallback(name) callback = self.findCallback(name)
try: try:
if callback is None: if callback is not None:
self.args.insert(0, name) anticap = ircdb.makeAntiCapability(name)
self.reply(self.msg, '[%s]' % ' '.join(self.args)) if ircdb.checkCapability(self.msg.prefix, anticap):
else: debug.debugMsg('Preventing %s from calling %s' % \
(self.msg.nick, name))
return
recipient = self.msg.args[0]
if ircutils.isChannel(recipient):
chancap = ircdb.makeChannelCapability(recipient, anticap)
if ircdb.checkCapability(self.msg.prefix, chancap):
debug.debugMsg('Preventing %s from calling %s' % \
(self.msg.nick, name))
return
command = getattr(callback, name) command = getattr(callback, name)
callback.callCommand(command, self, self.msg, self.args) callback.callCommand(command, self, self.msg, self.args)
else:
self.args.insert(0, name)
self.reply(self.msg, '[%s]' % ' '.join(self.args))
except ArgumentError: except ArgumentError:
self.reply(self.msg, command.__doc__.splitlines()[0]) self.reply(self.msg, command.__doc__.splitlines()[0])
except Error, e: except Error, e:
@ -341,15 +353,7 @@ class Privmsg(irclib.IrcCallback):
else: else:
f(irc, msg, args) f(irc, msg, args)
def _getCommands(self, args): _r = re.compile(r'^(\S+)')
commands = []
if type(args) == list:
commands.append(args[0])
for arg in args[1:]:
commands.extend(self._getCommands(arg))
return commands
_r = re.compile(r'(\w+)')
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
s = addressed(irc.nick, msg) s = addressed(irc.nick, msg)
#debug.printf('Privmsg.doPrivmsg: s == %r' % s) #debug.printf('Privmsg.doPrivmsg: s == %r' % s)
@ -363,21 +367,6 @@ class Privmsg(irclib.IrcCallback):
self.rateLimiter.put(msg) self.rateLimiter.put(msg)
msg = self.rateLimiter.get() msg = self.rateLimiter.get()
args = tokenize(s) args = tokenize(s)
commands = self._getCommands(args)
for command in commands:
anticap = ircdb.makeAntiCapability(command)
if ircdb.checkCapability(msg.prefix, anticap):
debug.debugMsg('Preventing %s from calling %s' % \
(msg.nick, command))
return
if ircutils.isChannel(msg.args[0]):
chan = msg.args[0]
chancap = ircdb.makeChannelCapability(chan, command)
antichancap = ircdb.makeAntiCapability(chancap)
if ircdb.checkCapability(msg.prefix, antichancap):
debug.debugMsg('Preventing %s from calling %s' % \
(msg.nick, command))
return
self.Proxy(irc, msg, args) self.Proxy(irc, msg, args)