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

nefarious: handle ban exempts in BURST

This commit is contained in:
James Lu 2016-04-15 12:19:41 -07:00
parent 8a7c39691f
commit cc16c610dd

View File

@ -468,6 +468,7 @@ class P10Protocol(Protocol):
# <- AB B #test 1460742014 +tnlk 10 testkey ABAAB,ABAAA:o :%*!*@bad.host # <- AB B #test 1460742014 +tnlk 10 testkey ABAAB,ABAAA:o :%*!*@bad.host
# <- AB B #test 1460742014 +tnl 10 ABAAB,ABAAA:o :%*!*@other.bad.host *!*@bad.host # <- AB B #test 1460742014 +tnl 10 ABAAB,ABAAA:o :%*!*@other.bad.host *!*@bad.host
# <- AB B #test2 1460743539 +l 10 ABAAA:vo :%*!*@bad.host # <- AB B #test2 1460743539 +l 10 ABAAA:vo :%*!*@bad.host
# <- AB B #test 1460747615 ABAAA:o :% ~ *!*@test.host
# 1 <channel> # 1 <channel>
# 2 <timestamp> # 2 <timestamp>
# 3+ [<modes> [<mode extra parameters>]] [<users>] [<bans>] # 3+ [<modes> [<mode extra parameters>]] [<users>] [<bans>]
@ -480,8 +481,21 @@ class P10Protocol(Protocol):
bans = [] bans = []
if args[-1].startswith('%'): if args[-1].startswith('%'):
# Ban lists start with a %. # Ban lists start with a %. However, if one argument is "~",
bans = args[-1][1:].split(' ') # Parse everything after it as an exempt (+e).
exempts = False
for host in args[-1][1:].split(' '):
if not host:
# Space between % and ~ ignore.
continue
elif host == '~':
exempts = True
continue
if exempts:
bans.append(('+e', host))
else:
bans.append(('+b', host))
# Remove this argument from the args list. # Remove this argument from the args list.
args = args[:-1] args = args[:-1]
@ -497,7 +511,7 @@ class P10Protocol(Protocol):
parsedmodes = [] parsedmodes = []
# Add the ban list to the list of modes to process. # Add the ban list to the list of modes to process.
parsedmodes.extend([('+b', host) for host in bans]) parsedmodes.extend(bans)
if parsedmodes: if parsedmodes:
utils.applyModes(self.irc, channel, parsedmodes) utils.applyModes(self.irc, channel, parsedmodes)