fix extbans
This commit is contained in:
parent
b8225fd507
commit
c90821186e
|
@ -268,7 +268,9 @@ class Ban(object):
|
||||||
def guessBanType(mask):
|
def guessBanType(mask):
|
||||||
if mask[0] == '%':
|
if mask[0] == '%':
|
||||||
return 'quiet'
|
return 'quiet'
|
||||||
elif ircutils.isUserHostmask(mask) or mask.endswith('(realname)'):
|
elif ircutils.isUserHostmask(mask) \
|
||||||
|
or mask[0] == '$' \
|
||||||
|
or mask.endswith('(realname)'):
|
||||||
if not ('*' in mask or '?' in mask or '$' in mask):
|
if not ('*' in mask or '?' in mask or '$' in mask):
|
||||||
# XXX hack over hack, we are supposing these are marks as normal
|
# XXX hack over hack, we are supposing these are marks as normal
|
||||||
# bans aren't usually set to exact match, while marks are.
|
# bans aren't usually set to exact match, while marks are.
|
||||||
|
|
|
@ -375,6 +375,8 @@ class BantrackerTestCase(ChannelPluginTestCase):
|
||||||
self.feedBan('nick', mode='k')
|
self.feedBan('nick', mode='k')
|
||||||
self.assertResponse('banremove 1 0',
|
self.assertResponse('banremove 1 0',
|
||||||
"Id 1 is a removal, only bans or quiets can be autoremoved.")
|
"Id 1 is a removal, only bans or quiets can be autoremoved.")
|
||||||
|
self.feedBan('$a:nick')
|
||||||
|
self.assertResponse('banremove 2 0', 'The operation succeeded.')
|
||||||
|
|
||||||
def testBanremoveBadId(self):
|
def testBanremoveBadId(self):
|
||||||
self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
|
self.assertResponse('banremove 1 0', "I don't know any ban with that id.")
|
||||||
|
|
Loading…
Reference in New Issue