python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-11 18:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

In channels CallbackQuery.message.from_user can be empty.

Browse source
This commit is contained in:
Alex Root Junior 2018-07-15 21:55:23 +03:00
parent ebc0a94201
commit 50ea2f37ae
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
aiogram/contrib/middlewares/logging.py
View file

@ -88,9 +88,13 @@ class LoggingMiddleware(BaseMiddleware):
async def on_pre_process_callback_query(self, callback_query: types.CallbackQuery): async def on_pre_process_callback_query(self, callback_query: types.CallbackQuery):
if callback_query.message: if callback_query.message:
self.logger.info(f"Received callback query [ID:{callback_query.id}] " if callback_query.message.from_user:
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}] " self.logger.info(f"Received callback query [ID:{callback_query.id}] "
f"from user [ID:{callback_query.message.from_user.id}]") f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}] "
f"from user [ID:{callback_query.message.from_user.id}]")
else:
self.logger.info(f"Received callback query [ID:{callback_query.id}] "
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]")
else: else:
self.logger.info(f"Received callback query [ID:{callback_query.id}] " self.logger.info(f"Received callback query [ID:{callback_query.id}] "
f"from inline message [ID:{callback_query.inline_message_id}] " f"from inline message [ID:{callback_query.inline_message_id}] "
@ -98,10 +102,15 @@ class LoggingMiddleware(BaseMiddleware):
async def on_post_process_callback_query(self, callback_query, results): async def on_post_process_callback_query(self, callback_query, results):
if callback_query.message: if callback_query.message:
self.logger.debug(f"{HANDLED_STR[bool(len(results))]} " if callback_query.message.from_user:
f"callback query [ID:{callback_query.id}] " self.logger.debug(f"{HANDLED_STR[bool(len(results))]} "
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}] " f"callback query [ID:{callback_query.id}] "
f"from user [ID:{callback_query.message.from_user.id}]") f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}] "
f"from user [ID:{callback_query.message.from_user.id}]")
else:
self.logger.debug(f"{HANDLED_STR[bool(len(results))]} "
f"callback query [ID:{callback_query.id}] "
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]")
else: else:
self.logger.debug(f"{HANDLED_STR[bool(len(results))]} " self.logger.debug(f"{HANDLED_STR[bool(len(results))]} "
f"callback query [ID:{callback_query.id}] " f"callback query [ID:{callback_query.id}] "