Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-30 23:09:23 +01:00
Code Issues Projects Releases Wiki Activity

urlSnarfer fixes.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-09-08 22:49:56 +00:00
parent db7940089b
commit d62a96679f
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/privmsgs.py
View File

@ -148,7 +148,7 @@ def thread(f):
def newf(self, irc, msg, args, *L, **kwargs):
ff = types.MethodType(f, self, self.__class__)
t = callbacks.CommandThread(target=irc._callCommand,
args=(f.func_name, ff, self),
args=(f.func_name, self),
kwargs=kwargs)
t.start()
return utils.changeFunctionName(newf, f.func_name, f.__doc__)
@ -171,29 +171,41 @@ class UrlSnarfThread(threading.Thread):
threading.Thread.__init__(self, *args, **kwargs)
self.setDaemon(True)
_snarfed = structures.smallqueue()
class SnarfQueue(ircutils.FloodQueue):
def key(self, channel):
return channel
def getTimeout(self):
return conf.supybot.snarfThrottle()
_snarfed = SnarfQueue()
class SnarfIrc(object):
def __init__(self, irc, channel, url):
self.irc = irc
self.url = url
self.channel = channel
def reply(self, *args, **kwargs):
_snarfed.enqueue(self.channel, self.url)
self.irc.reply(*args, **kwargs)
def urlSnarfer(f):
"""Protects the snarfer from loops and whatnot."""
f = _threadedWrapMethod(f)
def newf(self, irc, msg, match, *L, **kwargs):
channel = msg.args[0]
if ircutils.isChannel(channel):
if not ircutils.isChannel(channel):
return
c = ircdb.channels.getChannel(channel)
if c.lobotomized:
self.log.info('Refusing to snarf in %s: lobotomized.', channel)
return
now = time.time()
cutoff = now - conf.supybot.snarfThrottle()
while _snarfed and _snarfed[0][2] < cutoff:
_snarfed.dequeue()
url = match.group(0)
for (qUrl, target, when) in _snarfed:
if url == qUrl and target == channel and not world.testing:
self.log.debug('Not snarfing %s from %r: in queue.',
url, msg.prefix)
if _snarfed.has(channel, url):
self.log.info('Refusing to snarf %s, already snarfed.', url)
return
else:
_snarfed.enqueue((url, channel, now))
irc = SnarfIrc(irc, channel, url)
if self.threaded:
f(self, irc, msg, match, *L, **kwargs)
else:
@ -208,12 +220,16 @@ class CapabilityCheckingPrivmsg(callbacks.Privmsg):
before allowing any command to be called.
"""
capability = '' # To satisfy PyChecker
def callCommand(self, f, irc, msg, args):
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):
callbacks.Privmsg.callCommand(self, f, irc, msg, args)
self.__parent.callCommand(name, irc, msg, args, *L, **kwargs)
else:
self.log.warning('%r tried to call %s without %s.',
msg.prefix, f.im_func.func_name, self.capability)
self.log.warning('%s tried to call %s without %s.',
msg.prefix, name, self.capability)
irc.errorNoCapability(self.capability)