Skip to content

Commit

Permalink
fix: make_error_msg for imap
Browse files Browse the repository at this point in the history
  • Loading branch information
phot0n authored and barredterra committed Apr 5, 2024
1 parent 0229e6d commit b2cfa49
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions frappe/email/receive.py
Expand Up @@ -318,19 +318,26 @@ def is_temporary_system_problem(self, e):

def make_error_msg(self, message_meta, msg_num):
incoming_mail = None
traceback = frappe.get_traceback(with_context=True)
with suppress(Exception):
# retrieve headers
if not cint(self.settings.use_imap):
partial_message = self.pop.top(msg_num, 5)[1]
partial_message = b"\n".join(self.pop.top(msg_num, 5)[1])
else:
partial_message = self.imap.uid("fetch", message_meta, "(BODY.PEEK[HEADER])")[1]
partial_message = self.imap.uid("fetch", message_meta, "(BODY.PEEK[HEADER])")[1][0][1]

incoming_mail = Email(b"\n".join(partial_message))
incoming_mail = Email(partial_message)

if incoming_mail:
return "\nDate: {date}\nFrom: {from_email}\nSubject: {subject}\n".format(
date=incoming_mail.date, from_email=incoming_mail.from_email, subject=incoming_mail.subject
return (
"\nDate: {date}\nFrom: {from_email}\nSubject: {subject}\n\n\nTraceback: \n{traceback}".format(
date=incoming_mail.date,
from_email=incoming_mail.from_email,
subject=incoming_mail.subject,
traceback=traceback,
)
)
return traceback

def update_flag(self, folder, uid_list=None):
"""set all uids mails the flag as seen"""
Expand Down

0 comments on commit b2cfa49

Please sign in to comment.