From 1c108c7fed96c20af289016044b3557c74579a94 Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 18 Sep 2023 13:01:57 +0300 Subject: [PATCH] datastruct-fixes --- bot/handlers/handle_feedback.py | 2 +- bot/main.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bot/handlers/handle_feedback.py b/bot/handlers/handle_feedback.py index 1ff3835..68a6e07 100644 --- a/bot/handlers/handle_feedback.py +++ b/bot/handlers/handle_feedback.py @@ -42,7 +42,7 @@ async def handle_feedback(msg, state): async def handle_answer(msg): logger.info("handle answering feedback") logger.debug(msg) - if "reply_to_message" in msg: + if msg.get("reply_to_message"): answered_msg = msg.get("reply_to_message") if "from" not in answered_msg: answered_msg["from"] = vars(msg.from_user) diff --git a/bot/main.py b/bot/main.py index ae41eb6..00b2b21 100644 --- a/bot/main.py +++ b/bot/main.py @@ -27,6 +27,8 @@ async def command_start_handler(message: Message) -> None: @router.callback_query() async def process_callback(callback_query: CallbackQuery): cbq = vars(callback_query) + cbq["from"] = vars(callback_query.from_user) + cbq["message"] = vars(callback_query.message) data = cbq["data"] if data.startswith("vouch"): await handle_button(cbq) @@ -38,6 +40,8 @@ async def process_callback(callback_query: CallbackQuery): async def join_request_handler(update: ChatJoinRequest) -> None: print("chat join request") join_request = vars(update) + join_request["from"] = vars(update.from_user) + join_request["chat"] = vars(update.chat) await handle_join_request(join_request) @@ -45,6 +49,7 @@ async def join_request_handler(update: ChatJoinRequest) -> None: async def all_handler(message: Message) -> None: msg = vars(message) msg["from"] = vars(message.from_user) + msg["reply_to_message"] = vars(message.reply_to_message) msg["chat"] = vars(message.chat) await handle_routing(msg, state) await asyncio.sleep(1.0)