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

Merge pull request #33055 from sokumon/prevent-recursion

Browse source 
fix: increment retry_count first to prevent recursion
This commit is contained in:
Soham Kulkarni 2025-06-24 16:22:19 +05:30 • committed by GitHub
commit 92adc5a3a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/core/doctype/communication/communication.py
View file

@ -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)
)

3
frappe/email/receive.py
View file

@ -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