Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-06 17:44:09 +01:00
Code Issues Projects Releases Wiki Activity

Add optional capability checking for changing another user's Herald.

Browse Source
This commit is contained in:
James Vega 2005-04-29 01:52:36 +00:00
parent df73547745
commit d9ce747fef
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Herald/config.py
View File

@ -44,6 +44,9 @@ conf.registerChannelValue(Herald, 'heralding',
registry.Boolean(True, """Determines whether messages will be sent to the registry.Boolean(True, """Determines whether messages will be sent to the
channel when a recognized user joins; basically enables or disables the channel when a recognized user joins; basically enables or disables the
plugin.""")) plugin."""))
conf.registerGlobalValue(Herald, 'requireCapability',
registry.String('', """Determines what capability (if any) is required to
add/change/remove the herald of another user."""))
conf.registerChannelValue(Herald, 'throttle', conf.registerChannelValue(Herald, 'throttle',
registry.PositiveInteger(600, """Determines the minimum number of seconds registry.PositiveInteger(600, """Determines the minimum number of seconds
between heralds.""")) between heralds."""))

16
plugins/Herald/plugin.py
View File

@ -30,7 +30,6 @@
import os import os
import time import time
import supybot.log as log
import supybot.conf as conf import supybot.conf as conf
import supybot.utils as utils import supybot.utils as utils
import supybot.world as world import supybot.world as world
@ -178,6 +177,18 @@ class Herald(callbacks.Plugin):
irc.error('I have no herald for %s.' % user.name) irc.error('I have no herald for %s.' % user.name)
get = wrap(get, ['channel', first('otherUser', 'user')]) get = wrap(get, ['channel', first('otherUser', 'user')])
def _preCheck(self, irc, msg, user):
capability = self.registryValue('requireCapability')
if capability:
try:
u = ircdb.users.getUser(msg.prefix)
except KeyError:
irc.errorNotRegistered(Raise=True)
else:
if u != user:
if not ircdb.checkCapability(msg.prefix, capability):
irc.errorNoCapability(capability, Raise=True)
# I chose not to make <user|nick> optional in this command because # I chose not to make <user|nick> optional in this command because
# if it's not a valid username (e.g., if the user tyops and misspells a # if it's not a valid username (e.g., if the user tyops and misspells a
# username), it may be nice not to clobber the user's herald. # username), it may be nice not to clobber the user's herald.
@ -188,6 +199,7 @@ class Herald(callbacks.Plugin):
currently identified or recognized as) to <msg>. <channel> is only currently identified or recognized as) to <msg>. <channel> is only
necessary if the message isn't sent in the channel itself. necessary if the message isn't sent in the channel itself.
""" """
self._preCheck(irc, msg, user)
self.db[channel, user.id] = herald self.db[channel, user.id] = herald
irc.replySuccess() irc.replySuccess()
add = wrap(add, ['channel', 'otherUser', 'text']) add = wrap(add, ['channel', 'otherUser', 'text'])
@ -201,6 +213,7 @@ class Herald(callbacks.Plugin):
<channel> is only necessary if the message isn't sent in the channel <channel> is only necessary if the message isn't sent in the channel
itself. itself.
""" """
self._preCheck(irc, msg, user)
try: try:
del self.db[channel, user.id] del self.db[channel, user.id]
irc.replySuccess() irc.replySuccess()
@ -216,6 +229,7 @@ class Herald(callbacks.Plugin):
<user> is not given, defaults to the calling user. <channel> is only <user> is not given, defaults to the calling user. <channel> is only
necessary if the message isn't sent in the channel itself. necessary if the message isn't sent in the channel itself.
""" """
self._preCheck(irc, msg, user)
s = self.db[channel, user.id] s = self.db[channel, user.id]
newS = changer(s) newS = changer(s)
self.db[channel, user.id] = newS self.db[channel, user.id] = newS