GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-04-01 13:27:05 +02:00
Code Issues Projects Releases Wiki Activity

pr/insp: fix sjoinServer not updating the internal modes list

Browse Source
This commit is contained in:
James Lu 2015-07-14 18:20:10 -07:00
parent 876cf34825
commit 79a1ac9006
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
protocols/inspircd.py
View File

@ -65,7 +65,7 @@ def joinClient(irc, client, channel):
modes=utils.joinModes(irc.channels[channel].modes))) modes=utils.joinModes(irc.channels[channel].modes)))
irc.channels[channel].users.add(client) irc.channels[channel].users.add(client)
def sjoinServer(irc, server, channel, users, ts=None, modes=None): def sjoinServer(irc, server, channel, users, ts=None):
channel = channel.lower() channel = channel.lower()
server = server or irc.sid server = server or irc.sid
assert users, "sjoinServer: No users sent?" assert users, "sjoinServer: No users sent?"
@ -75,15 +75,25 @@ def sjoinServer(irc, server, channel, users, ts=None, modes=None):
ts = irc.channels[channel].ts ts = irc.channels[channel].ts
log.debug("sending SJOIN to %s%s with ts %s (that's %r)", channel, irc.name, ts, log.debug("sending SJOIN to %s%s with ts %s (that's %r)", channel, irc.name, ts,
time.strftime("%c", time.localtime(ts))) time.strftime("%c", time.localtime(ts)))
''' TODO: handle this properly!
if modes is None: if modes is None:
modes = irc.channels[channel].modes modes = irc.channels[channel].modes
else:
utils.applyModes(irc, channel, modes)
'''
modes = irc.channels[channel].modes
uids = [] uids = []
changedmodes = []
namelist = [] namelist = []
# We take <users> as a list of (prefixmodes, uid) pairs. # We take <users> as a list of (prefixmodes, uid) pairs.
for userpair in users: for userpair in users:
assert len(userpair) == 2, "Incorrect format of userpair: %r" % userpair assert len(userpair) == 2, "Incorrect format of userpair: %r" % userpair
prefixes, user = userpair
namelist.append(','.join(userpair)) namelist.append(','.join(userpair))
uids.append(userpair[1]) uids.append(user)
for m in prefixes:
changedmodes.append(('+%s' % m, user))
utils.applyModes(irc, channel, changedmodes)
namelist = ' '.join(namelist) namelist = ' '.join(namelist)
_sendFromServer(irc, server, "FJOIN {channel} {ts} {modes} :{users}".format( _sendFromServer(irc, server, "FJOIN {channel} {ts} {modes} :{users}".format(
ts=ts, users=namelist, channel=channel, ts=ts, users=namelist, channel=channel,