mirror of
https://github.com/jlu5/PyLink.git
synced 2025-02-25 18:00:39 +01:00
relay: don't rely on irc.pseudoclient as much during init
This commit is contained in:
parent
1c4cfa680c
commit
3930891e9f
@ -611,6 +611,8 @@ def relayJoins(irc, channel, users, ts, burst=True):
|
|||||||
assert user in irc.users, "(%s) relay.relayJoins: How is this possible? %r isn't in our user database." % (irc.name, user)
|
assert user in irc.users, "(%s) relay.relayJoins: How is this possible? %r isn't in our user database." % (irc.name, user)
|
||||||
u = getRemoteUser(irc, remoteirc, user)
|
u = getRemoteUser(irc, remoteirc, user)
|
||||||
|
|
||||||
|
if not u:
|
||||||
|
continue
|
||||||
|
|
||||||
if u not in remoteirc.channels[remotechan].users:
|
if u not in remoteirc.channels[remotechan].users:
|
||||||
# Note: only join users if they aren't already joined. This prevents op floods
|
# Note: only join users if they aren't already joined. This prevents op floods
|
||||||
@ -1092,7 +1094,7 @@ def handle_mode(irc, numeric, command, args):
|
|||||||
reversed_modes = irc.reverseModes(target, modes, oldobj=oldchan)
|
reversed_modes = irc.reverseModes(target, modes, oldobj=oldchan)
|
||||||
log.debug('(%s) relay.handle_mode: Reversing mode changes of %r with %r (CLAIM).',
|
log.debug('(%s) relay.handle_mode: Reversing mode changes of %r with %r (CLAIM).',
|
||||||
irc.name, modes, reversed_modes)
|
irc.name, modes, reversed_modes)
|
||||||
irc.proto.mode(irc.pseudoclient.uid, target, reversed_modes)
|
irc.proto.mode(irc.sid, target, reversed_modes)
|
||||||
break
|
break
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user