a little change for deep search

This commit is contained in:
Nicolas Coevoet 2013-12-01 12:35:40 +01:00
parent e6593efbe1
commit f887cd5d8c

View File

@ -237,9 +237,15 @@ def getBestPattern (n,irc):
results.append('%sr:%s' % (extprefix,n.realname.replace(' ','?'))) results.append('%sr:%s' % (extprefix,n.realname.replace(' ','?')))
return results return results
def clearExtendedBanPattern (pattern): def clearExtendedBanPattern (pattern,irc):
# a little method to cleanup extended pattern # a little method to cleanup extended pattern
if pattern.startswith('$'): extprefix = ''
extmodes = ''
if 'extban' in irc.state.supported:
ext = irc.state.supported['extban']
extprefix = ext.split(',')[0]
extmodes = ext.split(',')[1]
if pattern.startswith(extprefix):
pattern = pattern[1:] pattern = pattern[1:]
if pattern.startswith('~'): if pattern.startswith('~'):
pattern = pattern[1:] pattern = pattern[1:]
@ -493,7 +499,7 @@ class Ircd (object):
glob = '*%s*' % pattern glob = '*%s*' % pattern
like = '%'+pattern+'%' like = '%'+pattern+'%'
if pattern.startswith('$'): if pattern.startswith('$'):
pattern = clearExtendedBanPattern(pattern) pattern = clearExtendedBanPattern(pattern,irc)
glob = '*%s*' % pattern glob = '*%s*' % pattern
like = '%'+pattern+'%' like = '%'+pattern+'%'
elif ircutils.isUserHostmask(pattern): elif ircutils.isUserHostmask(pattern):