mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-10-14 17:59:29 +02:00
Moved some error handling to a different place.
This commit is contained in:
parent
0ba2815746
commit
ca4a8dceef
11
src/User.py
11
src/User.py
@ -178,11 +178,6 @@ class User(callbacks.Privmsg):
|
|||||||
if not ircutils.isUserHostmask(hostmask):
|
if not ircutils.isUserHostmask(hostmask):
|
||||||
irc.error('That\'s not a valid hostmask.')
|
irc.error('That\'s not a valid hostmask.')
|
||||||
return
|
return
|
||||||
s = hostmask.translate(string.ascii, '!@*?')
|
|
||||||
if len(s) < 10:
|
|
||||||
s = 'Hostmask must contain more than 10 non-wildcard characters.'
|
|
||||||
irc.error(s)
|
|
||||||
return
|
|
||||||
try:
|
try:
|
||||||
id = ircdb.users.getUserId(name)
|
id = ircdb.users.getUserId(name)
|
||||||
user = ircdb.users.getUser(id)
|
user = ircdb.users.getUser(id)
|
||||||
@ -197,7 +192,11 @@ class User(callbacks.Privmsg):
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
if user.checkHostmask(msg.prefix) or user.checkPassword(password):
|
if user.checkHostmask(msg.prefix) or user.checkPassword(password):
|
||||||
user.addHostmask(hostmask)
|
try:
|
||||||
|
user.addHostmask(hostmask)
|
||||||
|
except ValueError, e:
|
||||||
|
irc.error(str(e))
|
||||||
|
return
|
||||||
ircdb.users.setUser(id, user)
|
ircdb.users.setUser(id, user)
|
||||||
irc.replySuccess()
|
irc.replySuccess()
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user