GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-11-04 08:57:25 +01:00
Code Issues Projects Releases Wiki Activity

inspircd: work around extraneous letters sometimes sent in FJOIN TS

Browse Source 
Anope 1.8 potentially sends a trailing 'd' after the timestamp, which causes int() to error. This is technically valid in InspIRCd S2S because atoi() ignores non-digit characters, but it's strange behaviour either way:
<- :3AX FJOIN #monitor 1485462109d + :,3AXAAAAAK

Thansk to @koaxirc for reporting.

(cherry picked from commit 663e657bf5a82d9c2d1a1f3e9a02709118dc796b)
This commit is contained in:
James Lu 2017-02-05 21:05:50 -08:00
parent 0d99bc62d2
commit f7768a00a0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
protocols/inspircd.py
View File

@ -539,8 +539,13 @@ class InspIRCdProtocol(TS6BaseProtocol):
self.irc.channels[channel].users.add(user)
# Statekeeping with timestamps
their_ts = int(args[1])
# Statekeeping with timestamps. Note: some service packages (Anope 1.8) send a trailing
# 'd' after the timestamp, which we should strip out to prevent int() from erroring.
# This is technically valid in InspIRCd S2S because atoi() ignores non-digit characters,
# but it's strange behaviour either way...
# <- :3AX FJOIN #monitor 1485462109d + :,3AXAAAAAK
their_ts = int(''.join(char for char in args[1] if char.isdigit()))
our_ts = self.irc.channels[channel].ts
self.updateTS(servernumeric, channel, their_ts, changedmodes)