Merge branch 'cloak_account' of git://github.com/brrr2/lykos

This commit is contained in:
nyuszika7h 2014-02-21 22:52:51 +01:00
commit 3e2649bad1

View File

@ -513,8 +513,9 @@ def on_kicked(cli, nick, chan, victim, reason):
@hook("account") @hook("account")
def on_account(cli, nick, acc): def on_account(cli, nick, acc):
nick = parse_nick(nick)[0] nick, mode, user, cloak = parse_nick(nick)
if nick in var.USERS.keys(): if nick in var.USERS.keys():
var.USERS[nick]["cloak"] = cloak
var.USERS[nick]["account"] = acc var.USERS[nick]["account"] = acc
@cmd("stats") @cmd("stats")
@ -1077,8 +1078,12 @@ def update_last_said(cli, nick, chan, rest):
@hook("join") @hook("join")
def on_join(cli, raw_nick, chan, acc="*", rname=""): def on_join(cli, raw_nick, chan, acc="*", rname=""):
nick,m,u,cloak = parse_nick(raw_nick) nick,m,u,cloak = parse_nick(raw_nick)
if nick not in var.USERS.keys() and nick != botconfig.NICK: if nick != botconfig.NICK:
var.USERS[nick] = dict(cloak=cloak,account=acc) if nick not in var.USERS.keys():
var.USERS[nick] = dict(cloak=cloak,account=acc)
else:
var.USERS[nick]["cloak"] = cloak
var.USERS[nick]["account"] = acc
with var.GRAVEYARD_LOCK: with var.GRAVEYARD_LOCK:
if nick in var.DISCONNECTED.keys(): if nick in var.DISCONNECTED.keys():
clk = var.DISCONNECTED[nick][0] clk = var.DISCONNECTED[nick][0]