don't crash if a message content is None
This commit is contained in:
parent
4d3682eb23
commit
9bf7d618d8
2 changed files with 4 additions and 1 deletions
|
|
@ -128,6 +128,9 @@ class AntiSpam(object):
|
||||||
|
|
||||||
def check_mail(self, mail):
|
def check_mail(self, mail):
|
||||||
# Spambot with a long first-message.
|
# Spambot with a long first-message.
|
||||||
|
if mail['message'] is None:
|
||||||
|
return True
|
||||||
|
|
||||||
if mail['message'].find('Je veux que vous m\'ayez ecrit directement sur le mon e-mail') >= 0:
|
if mail['message'].find('Je veux que vous m\'ayez ecrit directement sur le mon e-mail') >= 0:
|
||||||
return False
|
return False
|
||||||
if mail['message'].find('ilusa12010@live.fr') >= 0:
|
if mail['message'].find('ilusa12010@live.fr') >= 0:
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
|
||||||
sender=my_name if int(mail['id_from']) == self.browser.my_id else mails['member']['pseudo'],
|
sender=my_name if int(mail['id_from']) == self.browser.my_id else mails['member']['pseudo'],
|
||||||
receivers=[my_name if int(mail['id_from']) != self.browser.my_id else mails['member']['pseudo']],
|
receivers=[my_name if int(mail['id_from']) != self.browser.my_id else mails['member']['pseudo']],
|
||||||
date=parse_dt(mail['date']),
|
date=parse_dt(mail['date']),
|
||||||
content=unescape(mail['message']).strip(),
|
content=unescape(mail['message'] or '').strip(),
|
||||||
signature=signature,
|
signature=signature,
|
||||||
children=[],
|
children=[],
|
||||||
flags=flags)
|
flags=flags)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue