From 18d5f1c075ab867ca976c95de2de6835782bbff9 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 5 Jun 2020 19:39:15 +0300
Subject: [PATCH] Always delete messages from db when deleting portal

---
 mautrix_facebook/portal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mautrix_facebook/portal.py b/mautrix_facebook/portal.py
index fd96b8e..90a06b5 100644
--- a/mautrix_facebook/portal.py
+++ b/mautrix_facebook/portal.py
@@ -463,6 +463,7 @@ class Portal(BasePortal):
             await intent.leave_room(room_id)
         except MatrixError:
             pass
+        DBMessage.delete_all_by_mxid(room_id)
 
     async def unbridge(self) -> None:
         await self.cleanup_room(self.main_intent, self.mxid, "Room unbridged", puppets_only=True)
@@ -470,7 +471,6 @@ class Portal(BasePortal):
 
     async def cleanup_and_delete(self) -> None:
         await self.cleanup_room(self.main_intent, self.mxid)
-        DBMessage.delete_all_by_mxid(self.mxid)
         self.delete()
 
     # endregion
-- 
GitLab