mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-30 22:24:20 +01:00
Removed src/privmsgs.py and all the accompanying crap.
This commit is contained in:
Jeremy Fincher
parent
1ff2033dc0
commit
7fb3b21d94
@ -45,7 +45,6 @@ import supybot.utils as utils
|
|||||||
from supybot.commands import *
|
from supybot.commands import *
|
||||||
import supybot.ircmsgs as ircmsgs
|
import supybot.ircmsgs as ircmsgs
|
||||||
import supybot.ircutils as ircutils
|
import supybot.ircutils as ircutils
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.schedule as schedule
|
import supybot.schedule as schedule
|
||||||
import supybot.callbacks as callbacks
|
import supybot.callbacks as callbacks
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,6 @@ import supybot.world as world
|
|||||||
from supybot.commands import *
|
from supybot.commands import *
|
||||||
import supybot.ircmsgs as ircmsgs
|
import supybot.ircmsgs as ircmsgs
|
||||||
import supybot.ircutils as ircutils
|
import supybot.ircutils as ircutils
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.registry as registry
|
import supybot.registry as registry
|
||||||
import supybot.callbacks as callbacks
|
import supybot.callbacks as callbacks
|
||||||
|
|
||||||
|
|||||||
@ -50,7 +50,6 @@ import supybot.plugin as plugin
|
|||||||
import supybot.drivers as drivers
|
import supybot.drivers as drivers
|
||||||
import supybot.ircmsgs as ircmsgs
|
import supybot.ircmsgs as ircmsgs
|
||||||
import supybot.ircutils as ircutils
|
import supybot.ircutils as ircutils
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.registry as registry
|
import supybot.registry as registry
|
||||||
import supybot.callbacks as callbacks
|
import supybot.callbacks as callbacks
|
||||||
import supybot.structures as structures
|
import supybot.structures as structures
|
||||||
|
|||||||
@ -39,7 +39,6 @@ import supybot.utils as utils
|
|||||||
import supybot.ircdb as ircdb
|
import supybot.ircdb as ircdb
|
||||||
from supybot.commands import *
|
from supybot.commands import *
|
||||||
import supybot.ircutils as ircutils
|
import supybot.ircutils as ircutils
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.callbacks as callbacks
|
import supybot.callbacks as callbacks
|
||||||
|
|
||||||
class User(callbacks.Privmsg):
|
class User(callbacks.Privmsg):
|
||||||
|
|||||||
138
src/privmsgs.py
138
src/privmsgs.py
@ -1,138 +0,0 @@
|
|||||||
###
|
|
||||||
# Copyright (c) 2002-2005, Jeremiah Fincher
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright notice,
|
|
||||||
# this list of conditions, and the following disclaimer.
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
# this list of conditions, and the following disclaimer in the
|
|
||||||
# documentation and/or other materials provided with the distribution.
|
|
||||||
# * Neither the name of the author of this software nor the name of
|
|
||||||
# contributors to this software may be used to endorse or promote products
|
|
||||||
# derived from this software without specific prior written consent.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
||||||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
###
|
|
||||||
|
|
||||||
"""
|
|
||||||
Includes various accessories for callbacks.Privmsg based callbacks.
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import supybot.fix as fix
|
|
||||||
|
|
||||||
import time
|
|
||||||
import types
|
|
||||||
import threading
|
|
||||||
|
|
||||||
import supybot.conf as conf
|
|
||||||
import supybot.utils as utils
|
|
||||||
import supybot.world as world
|
|
||||||
import supybot.ircdb as ircdb
|
|
||||||
import supybot.ircmsgs as ircmsgs
|
|
||||||
import supybot.ircutils as ircutils
|
|
||||||
import supybot.callbacks as callbacks
|
|
||||||
import supybot.structures as structures
|
|
||||||
|
|
||||||
# XXX Deprecated, will be removed in 0.90.0.
|
|
||||||
def getChannel(msg, args=(), raiseError=True):
|
|
||||||
"""Returns the channel the msg came over or the channel given in args.
|
|
||||||
|
|
||||||
If the channel was given in args, args is modified (the channel is
|
|
||||||
removed).
|
|
||||||
"""
|
|
||||||
if args and ircutils.isChannel(args[0]):
|
|
||||||
if conf.supybot.reply.requireChannelCommandsToBeSentInChannel():
|
|
||||||
if args[0] != msg.args[0]:
|
|
||||||
s = 'Channel commands must be sent in the channel to which ' \
|
|
||||||
'they apply; if this is not the behavior you desire, ' \
|
|
||||||
'ask the bot\'s administrator to change the registry ' \
|
|
||||||
'variable ' \
|
|
||||||
'supybot.reply.requireChannelCommandsToBeSentInChannel ' \
|
|
||||||
'to False.'
|
|
||||||
raise callbacks.Error, s
|
|
||||||
return args.pop(0)
|
|
||||||
elif ircutils.isChannel(msg.args[0]):
|
|
||||||
return msg.args[0]
|
|
||||||
else:
|
|
||||||
if raiseError:
|
|
||||||
raise callbacks.Error, 'Command must be sent in a channel or ' \
|
|
||||||
'include a channel in its arguments.'
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# XXX Deprecated, will be removed in 0.90.0.
|
|
||||||
def getArgs(args, required=1, optional=0):
|
|
||||||
"""Take the required/optional arguments from args.
|
|
||||||
|
|
||||||
Always returns a list of size required + optional, filling it with however
|
|
||||||
many empty strings is necessary to fill the tuple to the right size. If
|
|
||||||
there is only one argument, a string containing that argument is returned.
|
|
||||||
|
|
||||||
If there aren't enough args even to satisfy required, raise an error and
|
|
||||||
let the caller handle sending the help message.
|
|
||||||
"""
|
|
||||||
assert not isinstance(args, str), 'args should be a list.'
|
|
||||||
assert not isinstance(args, ircmsgs.IrcMsg), 'args should be a list.'
|
|
||||||
if len(args) < required:
|
|
||||||
raise callbacks.ArgumentError
|
|
||||||
if len(args) < required + optional:
|
|
||||||
ret = list(args) + ([''] * (required + optional - len(args)))
|
|
||||||
elif len(args) >= required + optional:
|
|
||||||
ret = list(args[:required + optional - 1])
|
|
||||||
ret.append(' '.join(args[required + optional - 1:]))
|
|
||||||
if len(ret) == 1:
|
|
||||||
return ret[0]
|
|
||||||
else:
|
|
||||||
return ret
|
|
||||||
|
|
||||||
# XXX Deprecated, will be removed in 0.90.0.
|
|
||||||
def checkCapability(f, capability):
|
|
||||||
"""Makes sure a user has a certain capability before a command will run.
|
|
||||||
capability can be either a string or a callable object which will be called
|
|
||||||
in order to produce a string for ircdb.checkCapability."""
|
|
||||||
def newf(self, irc, msg, args):
|
|
||||||
cap = capability
|
|
||||||
if callable(cap):
|
|
||||||
cap = cap()
|
|
||||||
if ircdb.checkCapability(msg.prefix, cap):
|
|
||||||
f(self, irc, msg, args)
|
|
||||||
else:
|
|
||||||
self.log.info('%s attempted %s without %s.',
|
|
||||||
msg.prefix, f.func_name, cap)
|
|
||||||
irc.errorNoCapability(cap)
|
|
||||||
return utils.changeFunctionName(newf, f.func_name, f.__doc__)
|
|
||||||
|
|
||||||
class CapabilityCheckingPrivmsg(callbacks.Privmsg):
|
|
||||||
"""A small subclass of callbacks.Privmsg that checks self.capability
|
|
||||||
before allowing any command to be called.
|
|
||||||
"""
|
|
||||||
capability = '' # To satisfy PyChecker
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
self.__parent = super(CapabilityCheckingPrivmsg, self)
|
|
||||||
self.__parent.__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
def callCommand(self, name, irc, msg, args, *L, **kwargs):
|
|
||||||
if ircdb.checkCapability(msg.prefix, self.capability):
|
|
||||||
self.__parent.callCommand(name, irc, msg, args, *L, **kwargs)
|
|
||||||
else:
|
|
||||||
self.log.warning('%s tried to call %s without %s.',
|
|
||||||
msg.prefix, name, self.capability)
|
|
||||||
irc.errorNoCapability(self.capability)
|
|
||||||
|
|
||||||
|
|
||||||
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
###
|
|
||||||
# Copyright (c) 2002-2005, Jeremiah Fincher
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright notice,
|
|
||||||
# this list of conditions, and the following disclaimer.
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
# this list of conditions, and the following disclaimer in the
|
|
||||||
# documentation and/or other materials provided with the distribution.
|
|
||||||
# * Neither the name of the author of this software nor the name of
|
|
||||||
# contributors to this software may be used to endorse or promote products
|
|
||||||
# derived from this software without specific prior written consent.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
||||||
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
###
|
|
||||||
|
|
||||||
from supybot.test import *
|
|
||||||
|
|
||||||
import supybot.ircmsgs as ircmsgs
|
|
||||||
import supybot.privmsgs as privmsgs
|
|
||||||
import supybot.callbacks as callbacks
|
|
||||||
|
|
||||||
class FunctionsTest(SupyTestCase):
|
|
||||||
def testGetChannel(self):
|
|
||||||
channel = '#foo'
|
|
||||||
msg = ircmsgs.privmsg(channel, 'foo bar baz')
|
|
||||||
args = msg.args[1].split()
|
|
||||||
originalArgs = args[:]
|
|
||||||
self.assertEqual(privmsgs.getChannel(msg, args), channel)
|
|
||||||
self.assertEqual(args, originalArgs)
|
|
||||||
msg = ircmsgs.privmsg('nick', '%s bar baz' % channel)
|
|
||||||
args = msg.args[1].split()
|
|
||||||
originalArgs = args[:]
|
|
||||||
self.assertEqual(privmsgs.getChannel(msg, args), channel)
|
|
||||||
self.assertEqual(args, originalArgs[1:])
|
|
||||||
|
|
||||||
def testGetArgs(self):
|
|
||||||
args = ['foo', 'bar', 'baz']
|
|
||||||
self.assertEqual(privmsgs.getArgs(args), ' '.join(args))
|
|
||||||
self.assertEqual(privmsgs.getArgs(args, required=2),
|
|
||||||
[args[0], ' '.join(args[1:])])
|
|
||||||
self.assertEqual(privmsgs.getArgs(args, required=3), args)
|
|
||||||
self.assertRaises(callbacks.ArgumentError,
|
|
||||||
privmsgs.getArgs, args, required=4)
|
|
||||||
self.assertEqual(privmsgs.getArgs(args, required=3, optional=1),
|
|
||||||
args + [''])
|
|
||||||
self.assertEqual(privmsgs.getArgs(args, required=0, optional=1),
|
|
||||||
' '.join(args))
|
|
||||||
|
|
||||||
|
|
||||||
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user