vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(minor): fix email error logging and strip Guest

Browse source
This commit is contained in:
Rushabh Mehta 2022-04-28 14:42:17 +05:30
parent 926ceb3b25
commit 6d266b19af
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/email/doctype/email_queue/email_queue.py
View file

@ -622,11 +622,13 @@ class QueueBuilder:
mail_to_string = cstr(mail.as_string())
except frappe.InvalidEmailAddressError:
# bad Email Address - don't add to queue
self.log_error(
frappe.log_error(
title="Invalid email address",
message="Invalid email address Sender: {0}, Recipients: {1}, \nTraceback: {2} ".format(
self.sender, ", ".join(self.final_recipients()), traceback.format_exc()
),
reference_doctype=self.reference_doctype,
reference_name=self.reference_name,
)
return

6
frappe/email/email_body.py
View file

@ -268,9 +268,9 @@ class EMail:
self.replace_sender()
self.replace_sender_name()
self.recipients = [strip(r) for r in self.recipients]
self.cc = [strip(r) for r in self.cc]
self.bcc = [strip(r) for r in self.bcc]
self.recipients = [strip(r) for r in self.recipients if r != "Guest"]
self.cc = [strip(r) for r in self.cc if r != "Guest"]
self.bcc = [strip(r) for r in self.bcc if r != "Guest"]
for e in self.recipients + (self.cc or []) + (self.bcc or []):
validate_email_address(e, True)