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

Merge branch 'master' of git+ssh://supybot.git.sourceforge.net/gitroot/supybot/supybot

Browse Source
This commit is contained in:
James Vega 2010-01-10 20:20:21 -05:00
commit 67c8554864
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/irclib.py
View File

@ -774,7 +774,7 @@ class Irc(IrcCommandDispatcher):
else: else:
channel = None channel = None
preInFilter = str(msg).rstrip('\r\n') preInFilter = str(msg).rstrip('\r\n')
log.debug('Incoming message: %s', preInFilter) log.debug('Incoming message (%s): %s', self.network, preInFilter)
# Yeah, so this is odd. Some networks (oftc) seem to give us certain # Yeah, so this is odd. Some networks (oftc) seem to give us certain
# messages with our nick instead of our prefix. We'll fix that here. # messages with our nick instead of our prefix. We'll fix that here.

5
src/ircutils.py
View File

@ -539,7 +539,10 @@ class FloodQueue(object):
repr(self.queues)) repr(self.queues))
def key(self, msg): def key(self, msg):
return msg.user + '@' + msg.host # This really ought to be configurable without subclassing, but for
# now, it works.
# used to be msg.user + '@' + msg.host but that was too easily abused.
return msg.host
def getTimeout(self): def getTimeout(self):
if callable(self.timeout): if callable(self.timeout):