mirror of
https://github.com/jlu5/PyLink.git
synced 2024-12-25 04:02:45 +01:00
relay: revert changes to mode handling that only bursts modes from the owning network on connect
This commit is contained in:
parent
6b8e80cd5b
commit
90ee20ee8b
@ -629,10 +629,8 @@ def relayJoins(irc, channel, users, ts, burst=True):
|
|||||||
# SJOIN will be used if either the amount of users to join is > 1, or there are modes
|
# SJOIN will be used if either the amount of users to join is > 1, or there are modes
|
||||||
# to be set on the joining user.
|
# to be set on the joining user.
|
||||||
if burst or len(queued_users) > 1 or queued_users[0][0]:
|
if burst or len(queued_users) > 1 or queued_users[0][0]:
|
||||||
# Send the SJOIN from the relay subserver on the target network.
|
|
||||||
rsid = getRemoteSid(remoteirc, irc)
|
|
||||||
modes = getSupportedCmodes(irc, remoteirc, channel, irc.channels[channel].modes)
|
modes = getSupportedCmodes(irc, remoteirc, channel, irc.channels[channel].modes)
|
||||||
remoteirc.proto.sjoin(rsid, remotechan, queued_users, ts=ts)
|
remoteirc.proto.sjoin(getRemoteSid(remoteirc, irc), remotechan, queued_users, ts=ts, modes=modes)
|
||||||
else:
|
else:
|
||||||
# A regular JOIN only needs the user and the channel. TS, source SID, etc., can all be omitted.
|
# A regular JOIN only needs the user and the channel. TS, source SID, etc., can all be omitted.
|
||||||
remoteirc.proto.join(queued_users[0][1], remotechan)
|
remoteirc.proto.join(queued_users[0][1], remotechan)
|
||||||
|
Loading…
Reference in New Issue
Block a user