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

fix users.match_hostmask only working on full hostmasks

Browse Source 
fixes admins list in botconfig.py when DISABLE_ACCOUNTS is true
This commit is contained in:
jacob1 2017-02-24 23:49:56 -05:00
parent c615a62f9d
commit bc6375cf24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/users.py
View File

@ -350,8 +350,8 @@ class User(IRCContext):
nick, ident, host = re.match("(?:(?:(.*?)!)?(.*?)@)?(.*)", hostmask).groups("") nick, ident, host = re.match("(?:(?:(.*?)!)?(.*?)@)?(.*)", hostmask).groups("")
temp = self.lower() temp = self.lower()
return (fnmatch.fnmatch(temp.nick, lower(nick)) and return ((not nick or fnmatch.fnmatch(temp.nick, lower(nick))) and
fnmatch.fnmatch(temp.ident, lower(ident)) and (not ident or fnmatch.fnmatch(temp.ident, lower(ident))) and
fnmatch.fnmatch(temp.host, lower(host, casemapping="ascii"))) fnmatch.fnmatch(temp.host, lower(host, casemapping="ascii")))
def prefers_notice(self): def prefers_notice(self):