Let's not short-circuit auto{Op,Halfop,Voice} until we actually do something.

This commit is contained in:
James Vega 2004-10-07 17:19:22 +00:00
parent 3e1d7953bc
commit b196d3fc21

View File

@ -177,14 +177,14 @@ class Enforcer(callbacks.Privmsg):
c = ircdb.channels.getChannel(channel)
if c.checkBan(msg.prefix) and self.registryValue('autoBan', channel):
self._doBan(irc, channel, msg.prefix)
elif ircdb.checkCapability(msg.prefix, _chanCap(channel, 'op')):
if self.registryValue('autoOp', channel):
elif self.registryValue('autoOp', channel) and \
ircdb.checkCapability(msg.prefix, _chanCap(channel, 'op')):
irc.queueMsg(ircmsgs.op(channel, msg.nick))
elif ircdb.checkCapability(msg.prefix, _chanCap(channel, 'halfop')):
if self.registryValue('autoHalfop', channel):
elif self.registryValue('autoHalfop', channel) and \
ircdb.checkCapability(msg.prefix, _chanCap(channel, 'halfop')):
irc.queueMsg(ircmsgs.halfop(channel, msg.nick))
elif ircdb.checkCapability(msg.prefix, _chanCap(channel, 'voice')):
if self.registryValue('autoVoice', channel):
elif self.registryValue('autoVoice', channel) and \
ircdb.checkCapability(msg.prefix, _chanCap(channel, 'voice')):
irc.queueMsg(ircmsgs.voice(channel, msg.nick))
self._enforceLimit(irc, channel)