From b59bf13682b217344af53c7e9b2e0381a8efddc4 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 23 Jun 2025 17:09:39 +0530 Subject: [PATCH 1/2] fix: increment retry_count first to prevent recursion --- frappe/email/receive.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index 8ad99777d9..e624d82a10 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -280,8 +280,9 @@ class EmailServer: except imaplib.IMAP4.abort: if self.retry_count < self.retry_limit: self.connect() - self.get_messages(folder) self.retry_count += 1 + self.get_messages(folder) + except Exception as e: if self.has_login_limit_exceeded(e): raise LoginLimitExceeded(e) from e From baf29c896cf5a4de03eaaa9e5f4adc4371ed47ec Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 24 Jun 2025 16:04:31 +0530 Subject: [PATCH 2/2] fix: remove like logic from permission query --- frappe/core/doctype/communication/communication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 4d8fd9bb08..b571e30440 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -490,8 +490,8 @@ def get_permission_query_conditions_for_communication(user): return """`tabCommunication`.communication_medium!='Email'""" email_accounts = ['"{}"'.format(account.get("email_account")) for account in accounts] - return """`tabCommunication`.email_account in ({email_accounts}) or `tabCommunication`.recipients LIKE '%{user}%' or `tabCommunication`.sender LIKE '%{user}%' or `tabCommunication`.cc LIKE '%{user}%' or `tabCommunication`.bcc LIKE '%{user}%'""".format( - email_accounts=",".join(email_accounts), user=user + return """`tabCommunication`.email_account in ({email_accounts})""".format( + email_accounts=",".join(email_accounts) )