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

Fix for G-LiTe's bug.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-29 23:33:31 +00:00
parent 3455bcb963
commit b5ad1bed54
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/irclib.py
View File

@ -319,7 +319,7 @@ class IrcState(IrcCommandDispatcher):
return self.nicksToHostmasks[nick] return self.nicksToHostmasks[nick]
def do352(self, irc, msg): def do352(self, irc, msg):
(nick, user, host) = (msg.args[2], msg.args[5], msg.args[3]) (nick, user, host) = (msg.args[5], msg.args[2], msg.args[3])
hostmask = '%s!%s@%s' % (nick, user, host) hostmask = '%s!%s@%s' % (nick, user, host)
self.nicksToHostmasks[nick] = hostmask self.nicksToHostmasks[nick] = hostmask
@ -536,9 +536,9 @@ class Irc(IrcCommandDispatcher):
else: else:
self.lastTake = now self.lastTake = now
msg = self.queue.dequeue() msg = self.queue.dequeue()
elif conf.supybot.pingServer() and \ elif self.afterConnect and \
now > (self.lastping + conf.supybot.pingInterval()) and \ conf.supybot.protocols.irc.ping() and \
self.afterConnect: now > self.lastping + conf.supybot.protocols.irc.ping.interval():
if self.outstandingPing: if self.outstandingPing:
s = 'Reconnecting to %s, ping not replied to.' % self.server s = 'Reconnecting to %s, ping not replied to.' % self.server
log.warning(s) log.warning(s)
@ -556,6 +556,7 @@ class Irc(IrcCommandDispatcher):
if msg is None: if msg is None:
log.debug('%s.outFilter returned None.' % callback.name()) log.debug('%s.outFilter returned None.' % callback.name())
return self.takeMsg() return self.takeMsg()
world.debugFlush()
if len(str(msg)) > 512: if len(str(msg)) > 512:
# Yes, this violates the contract, but at this point it doesn't # Yes, this violates the contract, but at this point it doesn't
# matter. That's why we gotta go munging in private attributes # matter. That's why we gotta go munging in private attributes
@ -679,6 +680,7 @@ class Irc(IrcCommandDispatcher):
log.exception('Exception in update of IrcState object:') log.exception('Exception in update of IrcState object:')
# Now call the callbacks. # Now call the callbacks.
world.debugFlush()
for callback in self.callbacks: for callback in self.callbacks:
try: try:
m = callback.inFilter(self, msg) m = callback.inFilter(self, msg)
@ -688,12 +690,14 @@ class Irc(IrcCommandDispatcher):
msg = m msg = m
except: except:
log.exception('Uncaught exception in inFilter:') log.exception('Uncaught exception in inFilter:')
world.debugFlush()
for callback in self.callbacks: for callback in self.callbacks:
try: try:
if callback is not None: if callback is not None:
callback(self, msg) callback(self, msg)
except: except:
log.exception('Uncaught exception in callback:') log.exception('Uncaught exception in callback:')
world.debugFlush()
def die(self): def die(self):
"""Makes the Irc object die. Dead.""" """Makes the Irc object die. Dead."""