Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #559 into 12.0 

Signed-off-by pedrobaeza
pull/555/head
OCA-git-bot 2020-06-26 11:12:25 +00:00
parent 994cc2e14a f185333091
commit 152cb95abb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail_drop_target/models/mail_thread.py
View File

@ -53,13 +53,18 @@ class MailThread(models.AbstractModel):
_('Install the msg-extractor library to handle .msg files') _('Install the msg-extractor library to handle .msg files')
) )
message_msg = Message(b64decode(message)) message_msg = Message(b64decode(message))
try:
message_id = message_msg.messageId
except AttributeError:
# Using extract_msg < 0.24.4
message_id = message_msg.message_id
message_email = self.env['ir.mail_server'].build_email( message_email = self.env['ir.mail_server'].build_email(
message_msg.sender, message_msg.to.split(','), message_msg.subject, message_msg.sender, message_msg.to.split(','), message_msg.subject,
# prefer html bodies to text # prefer html bodies to text
message_msg._getStream('__substg1.0_10130102') or message_msg.body, message_msg._getStream('__substg1.0_10130102') or message_msg.body,
email_cc=message_msg.cc, email_cc=message_msg.cc,
headers={'date': message_msg.date}, headers={'date': message_msg.date},
message_id=message_msg.message_id, message_id=message_id,
attachments=[ attachments=[
(attachment.longFilename, attachment.data) (attachment.longFilename, attachment.data)
for attachment in message_msg.attachments for attachment in message_msg.attachments