dictify

bot/main.py

@@ -35,6 +35,8 @@ async def command_start_handler(message: Message) -> None:
 async def process_callback(callback_query: CallbackQuery):
     cbq = vars(callback_query)
     try:
+        cbq["from"] = vars(callback_query.from_user)
+        cbq["message"] = vars(callback_query.message)
         data = cbq["data"]
         if data.startswith("vouch"):
             await handle_button(cbq)
@@ -50,6 +52,8 @@ async def join_request_handler(update: ChatJoinRequest) -> None:
     print("chat join request")
     join_request = vars(update)
     try:
+        join_request["from"] = vars(update.from_user)
+        join_request["chat"] = vars(update.chat)
         await handle_join_request(join_request)
     except Exception as e:
         logger.error(f"[main.join_request_handler] ERROR {e}")
@@ -60,6 +64,10 @@ async def join_request_handler(update: ChatJoinRequest) -> None:
 async def all_handler(message: Message) -> None:
     msg = vars(message)
     try:
+        msg["from"] = vars(message.from_user)
+        msg["chat"] = vars(message.chat)
+        if message.reply_to_message:
+            msg["reply_to_message"] = vars(message.reply_to_message)
         await handle_routing(msg, state)
         await asyncio.sleep(1.0)
     except Exception as e:
@@ -71,6 +79,8 @@ async def all_handler(message: Message) -> None:
 async def chat_members_change(update: ChatMemberUpdated):
     msg = vars(update)
     try:
+        msg["chat"] = vars(update.chat)
+        msg["from"] = vars(update.from_user)
         old_member = update["old_chat_member"]
         new_member = update["new_chat_member"]
         if old_member:
@@ -83,7 +93,7 @@ async def chat_members_change(update: ChatMemberUpdated):
             logger.info("unhandled members update")
     
     except Exception as e:
-        logger.error(f"[main.all_handler] ERROR {e}")
+        logger.error(f"[main.my_chat_member] ERROR {e}")
         logger.debug(msg)