From 11ff628ef808161e246429174bc6850557925561 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 20 May 2022 11:55:47 +0300
Subject: [PATCH] Always check database before handling message

---
 mautrix_telegram/portal.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py
index 1f23b86e..86ba7049 100644
--- a/mautrix_telegram/portal.py
+++ b/mautrix_telegram/portal.py
@@ -3153,16 +3153,18 @@ class Portal(DBPortal, BasePortal):
                     ).insert()
                 return
 
-        if self.backfill_lock.locked or self.peer_type == "channel":
-            msg = await DBMessage.get_one_by_tgid(TelegramID(evt.id), tg_space)
-            if msg:
-                self.log.debug(
-                    f"Ignoring message {evt.id} (src {source.tgid}) as it was already "
-                    f"handled into {msg.mxid}."
-                )
-                return
+        msg = await DBMessage.get_one_by_tgid(TelegramID(evt.id), tg_space)
+        if msg:
+            self.log.debug(
+                f"Ignoring message {evt.id} (src {source.tgid}) as it was already "
+                f"handled into {msg.mxid}."
+            )
+            return
 
-        self.log.trace("Handling Telegram message %s", evt)
+        self.log.debug(
+            "Handling Telegram message %s from %s (space: %s)", evt.id, sender.tgid, tg_space
+        )
+        self.log.trace("Message content: %s", evt)
 
         if sender and not sender.displayname:
             self.log.debug(