Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some minor input validation and fix a typo in mail contrib.

Browse source
This commit is contained in:
Griatch 2017-01-10 17:09:30 +01:00
parent b0ad1c06f4
commit 69551f88a1
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/contrib/mail.py
View file

@ -137,7 +137,11 @@ class CmdMail(default_cmds.MuxCommand):
body = self.rhs body = self.rhs
self.send_mail(self.lhslist, subject, body, self.caller) self.send_mail(self.lhslist, subject, body, self.caller)
else: else:
try:
message = self.get_all_mail()[int(self.lhs) - 1] message = self.get_all_mail()[int(self.lhs) - 1]
except ValueError:
self.caller.msg("'%s' is not a valid mail id." % self.lhs)
return
messageForm = [] messageForm = []
if message: if message:
@ -212,7 +216,7 @@ class CmdMail(default_cmds.MuxCommand):
new_message = create.create_message(self.caller, message, receivers=recipient, header=subject) new_message = create.create_message(self.caller, message, receivers=recipient, header=subject)
new_message.tags.add("U", category="mail") new_message.tags.add("U", category="mail")
caller.msg("You sent a your message.") caller.msg("You sent your message.")
return return
else: else:
caller.msg("No valid players found. Cannot send message.") caller.msg("No valid players found. Cannot send message.")