From c446b28d8b8497a314c0646707cdc79388b8cca4 Mon Sep 17 00:00:00 2001 From: JRoot Junior Date: Sat, 22 Jun 2024 02:41:50 +0300 Subject: [PATCH] #1520 Fixed event context resolving for the callback query that is coming from the business account --- aiogram/dispatcher/middlewares/user_context.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aiogram/dispatcher/middlewares/user_context.py b/aiogram/dispatcher/middlewares/user_context.py index c257079f..2d488a96 100644 --- a/aiogram/dispatcher/middlewares/user_context.py +++ b/aiogram/dispatcher/middlewares/user_context.py @@ -80,16 +80,18 @@ class UserContextMiddleware(BaseMiddleware): if event.chosen_inline_result: return EventContext(user=event.chosen_inline_result.from_user) if event.callback_query: - if event.callback_query.message: + callback_query_message = event.callback_query.message + if callback_query_message: return EventContext( - chat=event.callback_query.message.chat, + chat=callback_query_message.chat, user=event.callback_query.from_user, thread_id=( - event.callback_query.message.message_thread_id + callback_query_message.message_thread_id if not isinstance(event.callback_query.message, InaccessibleMessage) and event.callback_query.message.is_topic_message else None ), + business_connection_id=callback_query_message.business_connection_id, ) return EventContext(user=event.callback_query.from_user) if event.shipping_query: