fix email Message parsing
parent
337d5d4330
commit
9a7eeef600
|
@ -58,13 +58,16 @@ def make_report(msg, user):
|
||||||
date = get_date_from_header(msg['Date'])
|
date = get_date_from_header(msg['Date'])
|
||||||
|
|
||||||
author = msg['From'] # get mail author from email header
|
author = msg['From'] # get mail author from email header
|
||||||
text = msg.get_body(('plain',))
|
for part in msg.walk():
|
||||||
if not text:
|
if part.get_content_type() == 'text/plain':
|
||||||
text = re.sub(r'<[^>]*>', '', msg.get_body(('html',)))
|
text = part.get_payload()
|
||||||
if not text:
|
elif part.get_content_type() == 'text/html':
|
||||||
|
text = re.sub(r'<[^>]*>', '', msg.get_payload())
|
||||||
|
try:
|
||||||
|
post = report.Report(author, "mail", text, None, date)
|
||||||
|
except UnboundLocalError:
|
||||||
logger.error('No suitable message body')
|
logger.error('No suitable message body')
|
||||||
return
|
return
|
||||||
post = report.Report(author, "mail", text, None, date)
|
|
||||||
user.save_seen_mail(date)
|
user.save_seen_mail(date)
|
||||||
return post
|
return post
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue