Pathogen
/
monolith
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add additional error handling in user queries

This commit is contained in:
Mark Veidemanis 2020-05-31 13:44:34 +01:00
parent 63c97db12e
commit 40e1f38508
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/userinfo.py
View File

@ -149,10 +149,11 @@ def getUserByNick(name, nick):
return main.r.hget(mapspace, nick) return main.r.hget(mapspace, nick)
else: else:
warn("Entry doesn't exist: %s on %s - attempting auxiliary lookup" % (nick, mapspace)) warn("Entry doesn't exist: %s on %s - attempting auxiliary lookup" % (nick, mapspace))
#return Falsedd #return False
# legacy code below - remove when map is reliable # legacy code below - remove when map is reliable
usermatch = main.r.sscan(gnamespace, match=escape(nick)+"!*", count=-1) usermatch = main.r.sscan(gnamespace, match=escape(nick)+"!*", count=-1)
if usermatch[1] == []: if usermatch[1] == []:
warn("No matches found for user query: %s on %s" % (nick, name))
return False return False
else: else:
if len(usermatch[1]) == 1: if len(usermatch[1]) == 1:
@ -184,6 +185,8 @@ def renameUser(name, oldnick, olduser, newnick, newuser):
def delUserByNick(name, channel, nick): # kick def delUserByNick(name, channel, nick): # kick
user = getUserByNick(name, nick) user = getUserByNick(name, nick)
if not user:
return
delUser(name, channel, nick, user) delUser(name, channel, nick, user)
def delUserByNetwork(name, nick, user): # quit def delUserByNetwork(name, nick, user): # quit