Fix parse update

Author: coder8080

src/entities/utils.py

@@ -1,7 +1,4 @@
-from aiogram.types import Message, ReplyKeyboardMarkup
-from aiogram.types.base import TelegramObject
-from aiogram.types.callback_query import CallbackQuery
-from aiogram.types.pre_checkout_query import PreCheckoutQuery
+from aiogram.types import ReplyKeyboardMarkup, Update
 from aiogram.utils.keyboard import ReplyKeyboardBuilder
 
 from entities import ADMINS, TEXT
@@ -34,17 +31,18 @@ def get_keyboard(user: User):
     return user_markup()
 
 
-def get_update_user_info(update: TelegramObject):
+def get_update_user_info(update: Update):
     chat_id = 0
     username = ""
-    if (
-        isinstance(update, Message) or isinstance(update, PreCheckoutQuery)
-    ) and update.from_user:
-        chat_id = update.from_user.id
-        username = update.from_user.username
-    elif isinstance(update, CallbackQuery):
-        chat_id = update.from_user.id
-        username = update.from_user.username
+    if update.message and update.message.from_user:
+        chat_id = update.message.chat.id
+        username = update.message.from_user.username
+    elif update.callback_query:
+        chat_id = update.callback_query.from_user.id
+        username = update.callback_query.from_user.username
+    elif update.pre_checkout_query:
+        chat_id = update.pre_checkout_query.from_user.id
+        username = update.pre_checkout_query.from_user.username
 
     if username is None:
         username = f"unknown:${chat_id}"

src/routers/dispatcher.py

@@ -1,6 +1,7 @@
-from typing import Any, Awaitable, Callable, Dict
+from typing import Any, Awaitable, Callable, Dict, cast
 
 from aiogram import Dispatcher
+from aiogram.types import Update
 from aiogram.types.base import TelegramObject
 
 from entities import get_update_user_info, storage
@@ -18,10 +19,11 @@
 
 @dp.update.middleware
 async def get_user(
-    handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
-    update: TelegramObject,
+    handler: Callable[[Update, Dict[str, Any]], Awaitable[Any]],
+    _update: TelegramObject,
     data: Dict[str, Any],
 ):
+    update = cast(Update, _update)
     chat_id, username = get_update_user_info(update)
     if chat_id == 0:
         return await handler(update, data)