From 419080323556bf7480c3e983648cf0f34efd6b62 Mon Sep 17 00:00:00 2001 From: TIANYOU CHEN <42710806+CTY-git@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:55:10 +0800 Subject: [PATCH 1/3] Fix subject and ref bug --- patchwork/steps/SendEmail/SendEmail.py | 11 ++++++++--- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/patchwork/steps/SendEmail/SendEmail.py b/patchwork/steps/SendEmail/SendEmail.py index 9cdbadd7f..fda43777d 100644 --- a/patchwork/steps/SendEmail/SendEmail.py +++ b/patchwork/steps/SendEmail/SendEmail.py @@ -12,7 +12,7 @@ class SendEmail(Step, input_class=SendEmailInputs, output_class=SendEmailOutputs def __init__(self, inputs): super().__init__(inputs) self.email_template_value = inputs.get("email_template_value", dict()) - self.subject = inputs.get("subject", "Patchwork Execution Email") + self.subject = inputs.get("subject") self.body = inputs.get("body", "Patchwork Execution Email") self.sender_email = inputs["sender_email"] self.recipient_email = inputs["recipient_email"] @@ -26,12 +26,17 @@ def __init__(self, inputs): def run(self) -> dict: msg = EmailMessage() msg.set_content(mustache_render(self.body, self.email_template_value)) - msg["Subject"] = mustache_render(self.subject, self.email_template_value) msg["From"] = self.sender_email msg["To"] = self.recipient_email + if self.reply_message_id is not None: - msg.add_header("Reference", self.reply_message_id) + msg.add_header("References", self.reply_message_id) msg.add_header("In-Reply-To", self.reply_message_id) + else: + if self.subject is not None: + msg["Subject"] = mustache_render(self.subject, self.email_template_value) + else: + msg["Subject"] = "Patchwork Execution Email" smtp_clazz = smtplib.SMTP if self.is_ssl: diff --git a/pyproject.toml b/pyproject.toml index 70b6b4739..60f8c9138 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "patchwork-cli" -version = "0.0.116" +version = "0.0.117" description = "" authors = ["patched.codes"] license = "AGPL" From 4d5985ac5f86cfc8ab52b7a25a8cf24c479f54fd Mon Sep 17 00:00:00 2001 From: TIANYOU CHEN <42710806+CTY-git@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:23:15 +0800 Subject: [PATCH 2/3] add back --- patchwork/steps/SendEmail/SendEmail.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/patchwork/steps/SendEmail/SendEmail.py b/patchwork/steps/SendEmail/SendEmail.py index fda43777d..9d8b08830 100644 --- a/patchwork/steps/SendEmail/SendEmail.py +++ b/patchwork/steps/SendEmail/SendEmail.py @@ -26,17 +26,12 @@ def __init__(self, inputs): def run(self) -> dict: msg = EmailMessage() msg.set_content(mustache_render(self.body, self.email_template_value)) + msg["Subject"] = mustache_render(self.subject, self.email_template_value) msg["From"] = self.sender_email msg["To"] = self.recipient_email - if self.reply_message_id is not None: msg.add_header("References", self.reply_message_id) msg.add_header("In-Reply-To", self.reply_message_id) - else: - if self.subject is not None: - msg["Subject"] = mustache_render(self.subject, self.email_template_value) - else: - msg["Subject"] = "Patchwork Execution Email" smtp_clazz = smtplib.SMTP if self.is_ssl: From 7356f9330a40ad166bd701e8979ccdc8afab6631 Mon Sep 17 00:00:00 2001 From: TIANYOU CHEN <42710806+CTY-git@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:27:17 +0800 Subject: [PATCH 3/3] revert subject --- patchwork/steps/SendEmail/SendEmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patchwork/steps/SendEmail/SendEmail.py b/patchwork/steps/SendEmail/SendEmail.py index 9d8b08830..9cd41a423 100644 --- a/patchwork/steps/SendEmail/SendEmail.py +++ b/patchwork/steps/SendEmail/SendEmail.py @@ -12,7 +12,7 @@ class SendEmail(Step, input_class=SendEmailInputs, output_class=SendEmailOutputs def __init__(self, inputs): super().__init__(inputs) self.email_template_value = inputs.get("email_template_value", dict()) - self.subject = inputs.get("subject") + self.subject = inputs.get("subject", "Patchwork Execution Email") self.body = inputs.get("body", "Patchwork Execution Email") self.sender_email = inputs["sender_email"] self.recipient_email = inputs["recipient_email"]