Merge branch 'hotfix/now-when-official-message-was-removed'

dcrbrdev · May 21, 2020 · 929609f · 929609f
2 parents 0c9e9a6 + 0c56d39
commit 929609f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/db/observer.py b/db/observer.py
@@ -101,9 +101,13 @@ def _send_update_message(self, update_message):
             .objects(subject=subject,
                      observer=official_observer)\
             .order_by('-datetime').first()
-        telegram_message = BotTelegramCore.forward_message(
-            to_chat_id=self.chat_id,
-            from_chat_id=official_observer.chat_id,
-            message_id=last_official_message.message_id
-        )
-        self._create_message(telegram_message.message_id, subject)
+        try:
+            telegram_message = BotTelegramCore.forward_message(
+                to_chat_id=self.chat_id,
+                from_chat_id=official_observer.chat_id,
+                message_id=last_official_message.message_id
+            )
+            self._create_message(telegram_message.message_id, subject)
+        except BadRequest:
+            last_official_message.delete()
+            update_message.delete()