Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

AutoMode: Fix alternative capabilities handling.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-12-27 15:04:50 +00:00
parent 233571e4b5
commit df375e075a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/AutoMode/config.py
View File

@ -48,6 +48,10 @@ conf.registerChannelValue(AutoMode, 'enable',
conf.registerGlobalValue(AutoMode, 'owner', conf.registerGlobalValue(AutoMode, 'owner',
registry.Boolean(True, _("""Determines whether this plugin will automode registry.Boolean(True, _("""Determines whether this plugin will automode
owners even if they don't have op/halfop/voice/whatever capability."""))) owners even if they don't have op/halfop/voice/whatever capability.""")))
conf.registerChannelValue(AutoMode, 'alternativeCapabilities',
registry.Boolean(False, _("""Determines whether the bot will
check for 'alternative capabilities' (ie. autoop, autohalfop,
autovoice) in addition to/instead of classic ones.""")))
conf.registerChannelValue(AutoMode, 'fallthrough', conf.registerChannelValue(AutoMode, 'fallthrough',
registry.Boolean(False, _("""Determines whether the bot will "fall registry.Boolean(False, _("""Determines whether the bot will "fall
through" to halfop/voicing when auto-opping is turned off but through" to halfop/voicing when auto-opping is turned off but

9
plugins/AutoMode/plugin.py
View File

@ -57,14 +57,19 @@ class AutoMode(callbacks.Plugin):
cap_auto = ircdb.makeChannelCapability(channel, 'auto'+type) cap_auto = ircdb.makeChannelCapability(channel, 'auto'+type)
try: try:
apply_mode = ircdb.checkCapability(msg.prefix, cap, apply_mode = ircdb.checkCapability(msg.prefix, cap,
ignoreOwner=not self.registryValue('owner')) ignoreOwner=not self.registryValue('owner'),
ignoreChannelOp=True, ignoreDefaultAllow=True)
except KeyError: except KeyError:
apply_mode = False apply_mode = False
if self.registryValue('alternativeCapabilities', channel):
try: try:
override = ircdb.checkCapability(msg.prefix, cap_auto, override = ircdb.checkCapability(msg.prefix, cap_auto,
ignoreOwner=not self.registryValue('owner')) ignoreOwner=not self.registryValue('owner'),
ignoreChannelOp=True, ignoreDefaultAllow=True)
except KeyError: except KeyError:
override = False override = False
else:
override = False
if apply_mode or override: if apply_mode or override:
if override or self.registryValue(type, channel): if override or self.registryValue(type, channel):
self.log.info('Scheduling auto-%s of %s in %s.', self.log.info('Scheduling auto-%s of %s in %s.',