dm1sh/tgvkbot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Обработка ошибок

Browse Source
This commit is contained in:
Sergey 2020-10-08 23:37:36 +03:00
parent ddc5a0abee
commit 9fc82820ef
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vk_messages.py
View File

@ -3,6 +3,7 @@ from concurrent.futures._base import CancelledError, TimeoutError
from aiogram.utils.markdown import quote_html, hlink from aiogram.utils.markdown import quote_html, hlink
from aiovk.longpoll import LongPoll from aiovk.longpoll import LongPoll
from aiogram.utils.exceptions import MessageError
from bot import * from bot import *
@ -587,7 +588,6 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
to_tg_chat = vkuser.owner.uid to_tg_chat = vkuser.owner.uid
# Логика реплая на сообщение, которое уже есть в чате # Логика реплая на сообщение, которое уже есть в чате
# Таким кейсом нельзя управлять. Может упасть
if not main_message: if not main_message:
if vk_msg.get('reply_message'): if vk_msg.get('reply_message'):
reply_msg_in_db = Message.objects.filter( reply_msg_in_db = Message.objects.filter(
@ -640,10 +640,16 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
await bot.send_chat_action(to_tg_chat, ChatActions.TYPING) await bot.send_chat_action(to_tg_chat, ChatActions.TYPING)
except: except:
return return
tg_message = await bot.send_message(vkuser.owner.uid, body_parts[body_part], try: # Чтобы не падало при реплае на сообщение из чата внутри ТГ
parse_mode=ParseMode.HTML, tg_message = await bot.send_message(vkuser.owner.uid, body_parts[body_part],
reply_to_message_id=main_message, parse_mode=ParseMode.HTML,
disable_notification=disable_notify) reply_to_message_id=main_message,
disable_notification=disable_notify)
except MessageError: # Надо бы обновить aiogram, чтобы можно было ловить MessageToReplyNotFound
tg_message = await bot.send_message(vkuser.owner.uid, body_parts[body_part],
parse_mode=ParseMode.HTML,
reply_to_message_id=None,
disable_notification=disable_notify)
if body_part == 0: if body_part == 0:
header_message = tg_message header_message = tg_message
if forwarded: if forwarded:
@ -665,10 +671,16 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
await bot.send_chat_action(to_tg_chat, ChatActions.TYPING) await bot.send_chat_action(to_tg_chat, ChatActions.TYPING)
except: except:
return return
header_message = tg_message = await bot.send_message(to_tg_chat, header + body, try: # Чтобы не падало при реплае на сообщение из чата внутри ТГ
parse_mode=ParseMode.HTML, header_message = tg_message = await bot.send_message(to_tg_chat, header + body,
reply_to_message_id=main_message, parse_mode=ParseMode.HTML,
disable_notification=disable_notify) reply_to_message_id=main_message,
disable_notification=disable_notify)
except MessageError: # Надо бы обновить aiogram, чтобы можно было ловить MessageToReplyNotFound
header_message = tg_message = await bot.send_message(to_tg_chat, header + body,
parse_mode=ParseMode.HTML,
reply_to_message_id=None,
disable_notification=disable_notify)
if forwarded: if forwarded:
main_message = header_message.message_id main_message = header_message.message_id
Message.objects.create( Message.objects.create(