From 7952ce7ecf575699da74aee8004daa9f265126cb Mon Sep 17 00:00:00 2001
From: Son <son@son>
Date: Tue, 19 Oct 2021 11:58:05 +0200
Subject: [PATCH] sanity check to make sure the message id hasn't been added
 before

---
 email_handler.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index f538a381..43d102ea 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -1062,10 +1062,20 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
     msg[headers.MESSAGE_ID] = sl_message_id
     email_log.sl_message_id = sl_message_id
 
-    MessageIDMatching.create(
-        sl_message_id=sl_message_id,
-        original_message_id=original_message_id,
-    )
+    # sanity check to make sure the message id hasn't been added before
+    if not MessageIDMatching.get_by(
+        sl_message_id=sl_message_id
+    ) and not MessageIDMatching.get_by(original_message_id=original_message_id):
+        MessageIDMatching.create(
+            sl_message_id=sl_message_id,
+            original_message_id=original_message_id,
+        )
+    else:
+        LOG.w(
+            "Same SL or Original Message ID has been added before %s %s",
+            sl_message_id,
+            original_message_id,
+        )
 
     Session.commit()