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

added originally posted by to callback

Browse source
This commit is contained in:
Oleg A 2019-07-09 12:29:53 +03:00
parent a1531d4e20
commit 49e15545fa
1 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,10 +89,16 @@ class LoggingMiddleware(BaseMiddleware):
async def on_pre_process_callback_query(self, callback_query: types.CallbackQuery, data: dict): async def on_pre_process_callback_query(self, callback_query: types.CallbackQuery, data: dict):
if callback_query.message: if callback_query.message:
self.logger.info(f"Received callback query [ID:{callback_query.id}] " text = (f"Received callback query [ID:{callback_query.id}] "
f"from user [ID:{callback_query.from_user.id}] " f"from user [ID:{callback_query.from_user.id}] "
f"for message [ID:{callback_query.message.message_id}] " f"for message [ID:{callback_query.message.message_id}] "
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]") f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]")
if callback_query.message.from_user:
text += f" originally posted by [{callback_query.message.from_user.id}]"
self.logger.info(text)
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 user [ID:{callback_query.from_user.id}] " f"from user [ID:{callback_query.from_user.id}] "
@ -100,11 +106,17 @@ class LoggingMiddleware(BaseMiddleware):
async def on_post_process_callback_query(self, callback_query, results, data: dict): async def on_post_process_callback_query(self, callback_query, results, data: dict):
if callback_query.message: if callback_query.message:
self.logger.debug(f"{HANDLED_STR[bool(len(results))]} " text = (f"{HANDLED_STR[bool(len(results))]} "
f"callback query [ID:{callback_query.id}] " f"callback query [ID:{callback_query.id}] "
f"from user [ID:{callback_query.from_user.id}] " f"from user [ID:{callback_query.from_user.id}] "
f"for message [ID:{callback_query.message.message_id}] " f"for message [ID:{callback_query.message.message_id}] "
f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]") f"in chat [{callback_query.message.chat.type}:{callback_query.message.chat.id}]")
if callback_query.message.from_user:
text += f" originally posted by [{callback_query.message.from_user.id}]"
self.logger.info(text)
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}] "