Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 19:22:45 +01:00
Code Issues Projects Releases Wiki Activity

Made urlSnarfer respect lobotomies.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-02-24 21:16:53 +00:00
parent 90ace9437d
commit 07733594e9
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
* Fixed snarfers to respect lobotomies.
* Fixed Admin.join not to add the channel to the supybot.channels
registry entry if joining the channel wasn't successful.
2004-02-20 Jeremy Fincher <jemfinch@supybot.org> 2004-02-20 Jeremy Fincher <jemfinch@supybot.org>
* Version 0.77.0! * Version 0.77.0!

12
src/privmsgs.py
View File

@ -166,17 +166,23 @@ def urlSnarfer(f):
f = _threadedWrapMethod(f) f = _threadedWrapMethod(f)
q = structures.smallqueue() q = structures.smallqueue()
def newf(self, irc, msg, match, *L): def newf(self, irc, msg, match, *L):
channel = msg.args[0]
if ircutils.isChannel(channel):
c = ircdb.channels.getChannel(channel)
if c.lobotomized:
self.log.info('Refusing to snarf in %s: lobotomized.', channel)
return
now = time.time() now = time.time()
cutoff = now - conf.supybot.snarfThrottle() cutoff = now - conf.supybot.snarfThrottle()
while q and q[0][2] < cutoff: while q and q[0][2] < cutoff:
q.dequeue() q.dequeue()
url = match.group(0) url = match.group(0)
for (qUrl, target, when) in q: for (qUrl, target, when) in q:
if url == qUrl and target == msg.args[0] and not world.testing: if url == qUrl and target == channel and not world.testing:
self.log.warning('Not snarfing %s from %r.', url, msg.prefix) self.log.warning('Not snarfing %s from %r.', url, msg.prefix)
return return
else: else:
q.enqueue((url, msg.args[0], now)) q.enqueue((url, channel, now))
if self.threaded: if self.threaded:
f(self, irc, msg, match, *L) f(self, irc, msg, match, *L)
else: else:
@ -186,7 +192,7 @@ def urlSnarfer(f):
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()
newf = utils.changeFunctionName(newf, f.func_name, f.__doc__) newf = utils.changeFunctionName(newf, f.func_name, f.__doc__)
newf.q = q newf.q = q # This isn't necessary, it's just for debugging.
return newf return newf