beenull/opentrashmail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

added decoding of subjects. should fix #73

Browse source
This commit is contained in:
Christian Haschek 2024-01-23 15:08:13 +01:00
parent b4c31ded3e
commit e5dadc5c54
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
python/mailserver3.py
View file

@ -3,6 +3,7 @@ import asyncio
import ssl import ssl
from aiosmtpd.controller import Controller from aiosmtpd.controller import Controller
from email.parser import BytesParser from email.parser import BytesParser
from email.header import decode_header, make_header
from email import policy from email import policy
import os import os
import re import re
@ -52,6 +53,8 @@ class CustomHandler:
# Parse the email # Parse the email
message = BytesParser(policy=policy.default).parsebytes(envelope.content) message = BytesParser(policy=policy.default).parsebytes(envelope.content)
subject = str(make_header(decode_header(message['subject'])))
# Separate HTML and plaintext parts # Separate HTML and plaintext parts
plaintext = '' plaintext = ''
@ -99,7 +102,7 @@ class CustomHandler:
edata = { edata = {
'subject': message['subject'], 'subject': subject,
'body': plaintext, 'body': plaintext,
'htmlbody': self.replace_cid_with_attachment_id(html, attachments,filenamebase,em), 'htmlbody': self.replace_cid_with_attachment_id(html, attachments,filenamebase,em),
'from': message['from'], 'from': message['from'],