Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

getOtherUser shouldn't accept a hostmask (re: bug #1054680)

This commit is contained in:
James Vega 2004-10-26 18:32:11 +00:00
parent ca0c0fad49
commit a1b7b670fb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/commands.py
View File

@ -275,6 +275,8 @@ def getUser(irc, msg, args, state):
irc.errorNotRegistered(Raise=True)
def getOtherUser(irc, msg, args, state):
if ircutils.isUserHostmask(args[0]):
irc.errorNoUser(args[0])
try:
state.args.append(ircdb.users.getUser(args[0]))
del args[0]
@ -283,9 +285,8 @@ def getOtherUser(irc, msg, args, state):
getHostmask(irc, msg, args, state)
hostmask = state.args.pop()
state.args.append(ircdb.users.getUser(hostmask))
except (KeyError, IndexError, callbacks.Error):
# XXX We should eventually give the user here.
irc.errorNoUser()
except (KeyError, callbacks.Error):
irc.errorNoUser(name=hostmask)
def _getRe(f):
def get(irc, msg, args, state):