notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stasis is only added to accounts, not cloaks, when var.ACCOUNTS_ONLY is on

Browse Source 
can still manually specify a host with !fstasis. Also when an account is stasised, it no longer hides the fact that the host might be stasised also
This commit is contained in:
jacob1 2015-04-16 13:12:50 -04:00
parent f68ad397a8
commit b35287f0a1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wolfgame.py
View File

@ -442,6 +442,7 @@ def make_stasis(nick, penalty):
else: else:
var.STASISED_ACCS[acc] += penalty var.STASISED_ACCS[acc] += penalty
var.set_stasis_acc(acc, var.STASISED_ACCS[acc]) var.set_stasis_acc(acc, var.STASISED_ACCS[acc])
if (not var.ACCOUNTS_ONLY or not acc) and cloak:
if penalty == 0: if penalty == 0:
if cloak in var.STASISED: if cloak in var.STASISED:
del var.STASISED[cloak] del var.STASISED[cloak]
@ -6225,11 +6226,15 @@ def fstasis(cli, nick, chan, rest):
else: else:
cloak = user cloak = user
acc = None acc = None
if var.ACCOUNTS_ONLY and acc == "*":
acc = None
cloak = None
msg = "{0} is not logged in to NickServ.".format(user)
if not acc and user in var.STASISED_ACCS: if not acc and user in var.STASISED_ACCS:
acc = user acc = user
err_msg = "The amount of stasis has to be a non-negative integer."
if cloak: err_msg = "The amount of stasis has to be a non-negative integer."
if (not var.ACCOUNTS_ONLY or not acc) and cloak:
if len(data) == 1: if len(data) == 1:
if cloak in var.STASISED: if cloak in var.STASISED:
plural = "" if var.STASISED[cloak] == 1 else "s" plural = "" if var.STASISED[cloak] == 1 else "s"
@ -6314,8 +6319,8 @@ def fstasis(cli, nick, chan, rest):
for stas in var.USERS: for stas in var.USERS:
if var.USERS[stas]["account"] in accstas: if var.USERS[stas]["account"] in accstas:
stasised[var.USERS[stas]["account"]+" (Account)"] = accstas.pop(var.USERS[stas]["account"]) stasised[var.USERS[stas]["account"]+" (Account)"] = accstas.pop(var.USERS[stas]["account"])
if var.USERS[stas]["cloak"] in cloakstas: #if var.USERS[stas]["cloak"] in cloakstas:
del cloakstas[var.USERS[stas]["cloak"]] # del cloakstas[var.USERS[stas]["cloak"]]
elif var.USERS[stas]["cloak"] in cloakstas: elif var.USERS[stas]["cloak"] in cloakstas:
stasised[var.USERS[stas]["cloak"]+" (Host)"] = cloakstas.pop(var.USERS[stas]["cloak"]) stasised[var.USERS[stas]["cloak"]+" (Host)"] = cloakstas.pop(var.USERS[stas]["cloak"])
for oldcloak in cloakstas: for oldcloak in cloakstas: