Skip to content

Commit 0c56d39

Browse files
committed
Observer.notify now removes last ObserverMessage and last UpdateMessage
when occur BadRequest on forward message.
1 parent 0c9e9a6 commit 0c56d39

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

db/observer.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,13 @@ def _send_update_message(self, update_message):
101101
.objects(subject=subject,
102102
observer=official_observer)\
103103
.order_by('-datetime').first()
104-
telegram_message = BotTelegramCore.forward_message(
105-
to_chat_id=self.chat_id,
106-
from_chat_id=official_observer.chat_id,
107-
message_id=last_official_message.message_id
108-
)
109-
self._create_message(telegram_message.message_id, subject)
104+
try:
105+
telegram_message = BotTelegramCore.forward_message(
106+
to_chat_id=self.chat_id,
107+
from_chat_id=official_observer.chat_id,
108+
message_id=last_official_message.message_id
109+
)
110+
self._create_message(telegram_message.message_id, subject)
111+
except BadRequest:
112+
last_official_message.delete()
113+
update_message.delete()

0 commit comments

Comments
 (0)