From 74ac3038b03902284d3d45fbf821a6e3df9773e7 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Fri, 27 Oct 2023 17:30:01 +0800 Subject: [PATCH] fix misc --- app_common/__manifest__.py | 2 +- app_common/models/ir_mail_server.py | 11 ++++++----- app_common/models/mail_mail.py | 11 ++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index d903f571..fadc9f36 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -39,7 +39,7 @@ { 'name': "odooAi Common Util and Tools", - 'version': '16.23.10.25', + 'version': '16.23.10.27', 'author': 'odooai.cn', 'category': 'Base', 'website': 'https://www.odooai.cn', diff --git a/app_common/models/ir_mail_server.py b/app_common/models/ir_mail_server.py index 1f665086..4bff8a61 100644 --- a/app_common/models/ir_mail_server.py +++ b/app_common/models/ir_mail_server.py @@ -18,11 +18,12 @@ class IrMailServer(models.Model): email_to = message['To'] # 忽略掉无效email，避免被ban - if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: - pass - elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: - _logger.error(_("=================Email to ignore: %s") % email_to) - raise AssertionError(_("Email to ignore: %s") % email_to) + if email_to: + if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: + pass + elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: + _logger.error(_("=================Email to ignore: %s") % email_to) + raise AssertionError(_("Email to ignore: %s") % email_to) return super(IrMailServer, self).send_email(message, mail_server_id, smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption, smtp_debug, diff --git a/app_common/models/mail_mail.py b/app_common/models/mail_mail.py index 1b8b6d92..801cac5c 100644 --- a/app_common/models/mail_mail.py +++ b/app_common/models/mail_mail.py @@ -13,11 +13,12 @@ class MailMail(models.Model): for m in self: email_to = m.email_to # 忽略掉无效email，避免被ban - if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: - pass - elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: - _logger.error(_("=================Email to ignore: %s") % email_to) - self = self - m + if email_to: + if email_to.find('no-reply@odooai.cn') != -1 or email_to.find('postmaster-odoo@odooai.cn') != -1: + pass + elif email_to.find('example.com') != -1 or email_to.find('@sunpop.cn') != -1 or email_to.find('@odooapp.cn') != -1: + _logger.error(_("=================Email to ignore: %s") % email_to) + self = self - m if not self: return True return super(MailMail, self)._send(auto_commit, raise_exception, smtp_session)