From 57120ad51146073b6a4cd622c7ccbc8510554967 Mon Sep 17 00:00:00 2001
From: Nils Hamerlinck <nils@trobz.com>
Date: Thu, 28 Sep 2023 20:54:48 +0700
Subject: [PATCH] [FIX] mail_composer_cc_bcc: changes upstream

---
 mail_composer_cc_bcc/models/mail_mail.py       | 16 +++++++++++-----
 mail_composer_cc_bcc/tests/test_mail_cc_bcc.py |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mail_composer_cc_bcc/models/mail_mail.py b/mail_composer_cc_bcc/models/mail_mail.py
index 95d4c3556..eef4a432d 100644
--- a/mail_composer_cc_bcc/models/mail_mail.py
+++ b/mail_composer_cc_bcc/models/mail_mail.py
@@ -44,8 +44,8 @@ class MailMail(models.Model):
         success_pids = []
         failure_type = None
         # ===== Same with native Odoo =====
-        # https://github.com/odoo/odoo/blob/6ec4ba7ba22626219ddd09241c274b09a21fac0b
-        # /addons/mail/models/mail_mail.py#L375
+        # https://github.com/odoo/odoo/blob/0a3fc96cd51c0aab024207a4608f6ba32d49da36
+        # /addons/mail/models/mail_mail.py#L384
         try:
             if mail.state != "outgoing":
                 if mail.state != "exception" and mail.auto_delete:
@@ -125,11 +125,16 @@ class MailMail(models.Model):
                     records=notifs,
                 )
 
+            # protect against ill-formatted email_from when formataddr was used on an already formatted email # noqa: B950
+            emails_from = tools.email_split_and_format(mail.email_from)
+            email_from = emails_from[0] if emails_from else mail.email_from
+
             # build an RFC2822 email.message.Message object and send it without queuing
             res = None
             # TDE note: could be great to pre-detect missing to/cc and skip sending it
             # to go directly to failed state update
             # ===== Different than native Odoo =====
+            email["email_from"] = email_from
             msg = self.build_email(
                 email,
                 attachments=attachments,
@@ -230,12 +235,13 @@ class MailMail(models.Model):
     def build_email(self, email, attachments=None, headers=None):
         env = self.env
         mail = self
+        email_from = email.get("email_from")
         IrMailServer = env["ir.mail_server"]
         # ===== Same with native Odoo =====
-        # https://github.com/odoo/odoo/blob/6ec4ba7ba22626219ddd09241c274b09a21fac0b
-        # /addons/mail/models/mail_mail.py#L447
+        # https://github.com/odoo/odoo/blob/0a3fc96cd51c0aab024207a4608f6ba32d49da36
+        # /addons/mail/models/mail_mail.py#L458
         msg = IrMailServer.build_email(
-            email_from=mail.email_from,
+            email_from=email_from,
             email_to=email.get("email_to"),
             subject=mail.subject,
             body=email.get("body"),
diff --git a/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py b/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
index 49f44094c..c9dc3584a 100644
--- a/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
+++ b/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
@@ -10,7 +10,7 @@ from odoo.tests import Form
 from odoo.addons.mail.models.mail_mail import MailMail as upstream
 from odoo.addons.mail.tests.test_mail_composer import TestMailComposer
 
-VALID_HASHES = ["5f8b9bd28ccfe4f4ef1702002b2ab3fc"]
+VALID_HASHES = ["5f8b9bd28ccfe4f4ef1702002b2ab3fc", "0e47779dfd6e70de1cc1457792c68c0f"]
 
 
 class TestMailCcBcc(TestMailComposer):