3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 03:29:28 +01:00

uhhh.... let's clear our variables properly

This commit is contained in:
James Lu 2015-06-20 21:06:45 -07:00
parent aeb53a14e3
commit ce249dfe33
2 changed files with 10 additions and 2 deletions

View File

@ -212,7 +212,9 @@ def handle_uid(irc, numeric, command, args):
uid, ts, nick, realhost, host, ident, ip = args[0:7] uid, ts, nick, realhost, host, ident, ip = args[0:7]
realname = args[-1] realname = args[-1]
irc.users[uid] = IrcUser(nick, ts, uid, ident, host, realname, realhost, ip) irc.users[uid] = IrcUser(nick, ts, uid, ident, host, realname, realhost, ip)
utils.applyModes(irc.users[uid].modes, utils.parseModes(args[8:9])) parsedmodes = utils.parseModes(args[8:9])
print('Applying modes %s for %s' % (parsedmodes, uid))
irc.users[uid].modes = utils.applyModes(irc.users[uid].modes, parsedmodes)
irc.servers[numeric].users.append(uid) irc.servers[numeric].users.append(uid)
def handle_quit(irc, numeric, command, args): def handle_quit(irc, numeric, command, args):
@ -259,7 +261,7 @@ def handle_mode(irc, numeric, command, args):
target = args[0] target = args[0]
modestrings = args[1:] modestrings = args[1:]
changedmodes = utils.parseModes(modestrings) changedmodes = utils.parseModes(modestrings)
utils.applyModes(irc.users[numeric].modes, changedmodes) irc.users[numeric].modes = utils.applyModes(irc.users[numeric].modes, changedmodes)
def handle_squit(irc, numeric, command, args): def handle_squit(irc, numeric, command, args):
# :70M SQUIT 1ML :Server quit by GL!gl@0::1 # :70M SQUIT 1ML :Server quit by GL!gl@0::1

View File

@ -76,13 +76,19 @@ def parseModes(args):
return res return res
def applyModes(modelist, changedmodes): def applyModes(modelist, changedmodes):
modelist = modelist.copy()
print('Initial modelist: %s' % modelist)
print('Changedmodes: %r' % changedmodes)
for mode in changedmodes: for mode in changedmodes:
if mode[0] == '+': if mode[0] == '+':
# We're adding a mode # We're adding a mode
modelist.add(mode) modelist.add(mode)
print('Adding mode %r' % mode)
else: else:
# We're removing a mode # We're removing a mode
modelist.discard(mode) modelist.discard(mode)
print('Removing mode %r' % mode)
print('Final modelist: %s' % modelist)
return modelist return modelist
def joinModes(modes): def joinModes(modes):