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

Fix -acc and -host switches on fallow/fdeny

Browse Source
This commit is contained in:
skizzerz 2015-10-17 14:13:56 -05:00
parent 1aff6f4e6a
commit 15b547ed77
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/wolfgame.py
View File

@ -7350,9 +7350,8 @@ def allow_deny(cli, nick, chan, rest, mode):
opts["cmd"] = data[1] opts["cmd"] = data[1]
data = data[1:] data = data[1:]
elif data[0] == "-acc": elif data[0] == "-acc" or data[0] == "-account":
opts["acc"] = True opts["acc"] = True
data = data[1:]
elif data[0] == "-host": elif data[0] == "-host":
opts["host"] = True opts["host"] = True
else: else:
@ -7369,24 +7368,24 @@ def allow_deny(cli, nick, chan, rest, mode):
lusers = {k.lower(): v for k, v in var.USERS.items()} lusers = {k.lower(): v for k, v in var.USERS.items()}
user = data[0] user = data[0]
if user.lower() in lusers: if opts["acc"] and user != "*":
hostmask = None
acc = user
elif not opts["host"] and user.lower() in lusers:
ident = lusers[user.lower()]["ident"] ident = lusers[user.lower()]["ident"]
host = lusers[user.lower()]["host"] host = lusers[user.lower()]["host"]
acc = lusers[user.lower()]["account"] acc = lusers[user.lower()]["account"]
hostmask = ident + "@" + host hostmask = ident + "@" + host
elif opts["acc"]:
hostmask = None
acc = user
else: else:
hostmask = user hostmask = user
m = re.match('(?:(?:(.*?)!)?(.*)@)?(.*)', hostmask) m = re.match('(?:(?:(.*?)!)?(.*)@)?(.*)', hostmask)
user = m.group(1) user = m.group(1) or ""
ident = m.group(2) ident = m.group(2) or ""
host = m.group(3) host = m.group(3)
acc = None acc = None
if not acc or acc == "*" or opts["host"]: if user == "*":
acc = None opts["host"] = True
if not var.DISABLE_ACCOUNTS and acc: if not var.DISABLE_ACCOUNTS and acc:
if mode == "allow": if mode == "allow":
@ -7451,7 +7450,7 @@ def allow_deny(cli, nick, chan, rest, mode):
if acc in variable: if acc in variable:
del variable[acc] del variable[acc]
msg = "\u0002{0}\u0002 (Account: {1}) is no longer {2} commands.".format(data[0], acc, "allowed any special" if mode == 'allow' else "denied any") msg = "\u0002{0}\u0002 (Account: {1}) is no longer {2} commands.".format(data[0], acc, "allowed any special" if mode == 'allow' else "denied any")
elif var.ACCOUNTS_ONLY: elif var.ACCOUNTS_ONLY and not opts["host"]:
msg = "Error: \u0002{0}\u0002 is not logged in to NickServ.".format(data[0]) msg = "Error: \u0002{0}\u0002 is not logged in to NickServ.".format(data[0])
else: else:
if mode == "allow": if mode == "allow":
@ -7521,11 +7520,11 @@ def allow_deny(cli, nick, chan, rest, mode):
variable = var.DENY_ACCOUNTS variable = var.DENY_ACCOUNTS
if variable: if variable:
for acc, varied in variable.items(): for acc, varied in variable.items():
if var.ACCOUNTS_ONLY: if var.ACCOUNTS_ONLY and not opts["host"]:
users_to_cmds[acc] = sorted(varied, key=str.lower) users_to_cmds[acc] = sorted(varied, key=str.lower)
else: else:
users_to_cmds[acc+" (Account)"] = sorted(varied, key=str.lower) users_to_cmds[acc+" (Account)"] = sorted(varied, key=str.lower)
if not var.ACCOUNTS_ONLY: if not var.ACCOUNTS_ONLY or opts["host"]:
if mode == "allow": if mode == "allow":
variable = var.ALLOW variable = var.ALLOW
else: else: