From 839224a950deb717a3d2347aea28432866173ac6 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Sat, 21 Oct 2023 13:16:01 +0300
Subject: [PATCH] fixes-dict

---
 bot/main.py          | 25 +++----------------------
 bot/utils/mention.py |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/bot/main.py b/bot/main.py
index 77d1d6c..822cd04 100644
--- a/bot/main.py
+++ b/bot/main.py
@@ -34,17 +34,7 @@ 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)
-    cbq["message"]["chat"] = vars(callback_query.message.chat)
-    data = cbq["data"]
-    if data.startswith("vouch"):
-        await handle_button(cbq)
-    elif data.startswith("unlink"):
-        await handle_unlink(cbq, state)
     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)
@@ -60,8 +50,6 @@ 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}")
@@ -72,10 +60,6 @@ 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:
@@ -87,11 +71,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)
-        logger.debug(msg)
-        old_member = update.old_chat_member
-        new_member = update.new_chat_member
+        old_member = update["old_chat_member"]
+        new_member = update["new_chat_member"]
         if old_member:
             if old_member.status == ChatMemberStatus.KICKED:
                 Profile.erase(update.from_user.id)
@@ -103,7 +84,7 @@ async def chat_members_change(update: ChatMemberUpdated):
     
     except Exception as e:
         logger.error(f"[main.all_handler] ERROR {e}")
-        logger.debu(msg)
+        logger.debug(msg)
 
 
 async def main() -> None:
diff --git a/bot/utils/mention.py b/bot/utils/mention.py
index ccbb0b3..f19a197 100644
--- a/bot/utils/mention.py
+++ b/bot/utils/mention.py
@@ -12,7 +12,7 @@ def mention(user):
 
 
 def userdata_extract(user):
-    ln = " " + user.get('last_name') if user.get('last_name') else ""
+    ln = " " + user.get('last_name', "") if user.get('last_name', "") else ""
     identity = f"{user['first_name']}{ln}"
     uid = user["id"]
     username = user.get("username", "")