mirror of
https://github.com/jlu5/PyLink.git
synced 2024-12-24 19:52:53 +01:00
Merge branch 'devel' into wip/unrealircd
This commit is contained in:
commit
619b004bdf
@ -94,7 +94,8 @@ class InspIRCdProtocol(TS6BaseProtocol):
|
||||
raise LookupError('No such PyLink PseudoClient exists.')
|
||||
|
||||
orig_ts = self.irc.channels[channel].ts
|
||||
self.updateTS(channel, ts or orig_ts)
|
||||
ts = ts or orig_ts
|
||||
self.updateTS(channel, ts)
|
||||
|
||||
log.debug("sending SJOIN to %s%s with ts %s (that's %r)", channel, self.irc.name, ts,
|
||||
time.strftime("%c", time.localtime(ts)))
|
||||
|
@ -91,7 +91,8 @@ class TS6Protocol(TS6BaseProtocol):
|
||||
raise LookupError('No such PyLink PseudoClient exists.')
|
||||
|
||||
orig_ts = self.irc.channels[channel].ts
|
||||
self.updateTS(channel, ts or orig_ts)
|
||||
ts = ts or orig_ts
|
||||
self.updateTS(channel, ts)
|
||||
|
||||
log.debug("(%s) sending SJOIN to %s with ts %s (that's %r)", self.irc.name, channel, ts,
|
||||
time.strftime("%c", time.localtime(ts)))
|
||||
|
Loading…
Reference in New Issue
Block a user