From 5c3466bf8235a555cd17713e043760c3134e20b5 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 24 Jul 2015 10:50:39 -0700 Subject: [PATCH] relay: briefly workaround #74 by reordering our user checks --- plugins/relay.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/relay.py b/plugins/relay.py index 9932a17..186e352 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -615,6 +615,10 @@ def relayJoins(irc, channel, users, ts, modes): continue log.debug('(%s) relayJoins: got %r for users', irc.name, users) for user in users.copy(): + if utils.isInternalClient(irc, user) or user not in irc.users: + # We don't need to clone PyLink pseudoclients... That's + # meaningless. + continue try: if irc.users[user].remote: # Is the .remote attribute set? If so, don't relay already @@ -622,10 +626,6 @@ def relayJoins(irc, channel, users, ts, modes): continue except AttributeError: # Nope, it isn't. pass - if utils.isInternalClient(irc, user) or user not in irc.users: - # We don't need to clone PyLink pseudoclients... That's - # meaningless. - continue log.debug('Okay, spawning %s/%s everywhere', user, irc.name) assert user in irc.users, "(%s) How is this possible? %r isn't in our user database." % (irc.name, user) u = getRemoteUser(irc, remoteirc, user)