Skip to content

Commit

Permalink
[FIX] mail_tracking: reduce spammy score
Browse files Browse the repository at this point in the history
  • Loading branch information
Jairo Llopis authored and hanamanth.gollar committed Dec 12, 2022
1 parent d18bd5a commit b83ed24
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion mail_tracking/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"name": "Email tracking",
"summary": "Email tracking system for all mails sent",
"version": "14.0.1.0.0",
"version": "14.0.1.0.1",
"category": "Social Network",
"website": "https://github.com/OCA/social",
"author": ("Tecnativa, " "Odoo Community Association (OCA)"),
Expand Down
15 changes: 11 additions & 4 deletions mail_tracking/models/ir_mail_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def _tracking_headers_add(self, tracking_email_id, headers):
"""Allow other addons to add its own tracking SMTP headers"""
headers = headers or {}
headers["X-Odoo-Database"] = getattr(threading.currentThread(), "dbname", None)
headers["X-Odoo-Tracking-ID"] = tracking_email_id
headers["X-Odoo-MailTracking-ID"] = tracking_email_id
return headers

def _tracking_email_id_body_get(self, body):
Expand Down Expand Up @@ -64,9 +64,16 @@ def build_email(
return msg

def _tracking_email_get(self, message):
tracking_email_id = False
if message.get("X-Odoo-Tracking-ID", "").isdigit():
tracking_email_id = int(message["X-Odoo-Tracking-ID"])
try:
tracking_email_id = int(
message.get(
"X-Odoo-MailTracking-ID",
# Deprecated tracking header, kept as fallback
message["X-Odoo-Tracking-ID"],
)
)
except (TypeError, ValueError, KeyError):
tracking_email_id = False
return self.env["mail.tracking.email"].browse(tracking_email_id)

def _smtp_server_get(self, mail_server_id, smtp_server):
Expand Down

0 comments on commit b83ed24

Please sign in to comment.