diff --git a/BotCode/routers/common/messages.py b/BotCode/routers/common/messages.py index 521c70b..3d9907f 100644 --- a/BotCode/routers/common/messages.py +++ b/BotCode/routers/common/messages.py @@ -4,22 +4,19 @@ from BotLibrary import * from aiogram import Router, types - -from ..downloads.download_avatar_all import download_avatar +from routers.msg_default import * # Настройка экспорта модулей и роутера __all__ = ("router",) router = Router(name="common_message_router") +log_type = "Messages" + # Хэндлер на все сообщения и записывает данные @router.message() async def handle_all_messages(message: types.Message): - log_type = "Messages" - name = find_chat_id(message) + user_name = find_imp_id(message.from_user.id) message_type = types_message(message) - await logginger(message) - await download_avatar(message) - - await common_msg_logginger(message, name, message_type, log_type) - return f"Получено новое сообщение!" + await common_msg_logginger(message, user_name, message_type, log_type) + await msg_default(message) diff --git a/BotCode/routers/common/phrase.py b/BotCode/routers/common/phrase.py index 91027ab..7083a1a 100644 --- a/BotCode/routers/common/phrase.py +++ b/BotCode/routers/common/phrase.py @@ -1,11 +1,16 @@ +# BotCode/routers/common/phrase.py +# Обработчик особых команд + from aiogram import Router, types, F from aiogram.types import ReplyKeyboardRemove -from BotLibrary import find_chat_id, types_message, common_msg_logginger +from routers.msg_default import * +from BotLibrary import find_imp_id, types_message, common_msg_logginger from keyboards.reply_kb.start_kb import ButtonText # Настройка экспорта модулей и роутера __all__ = ("router",) + router = Router(name="phrase_message_router") @@ -14,7 +19,7 @@ router = Router(name="phrase_message_router") async def hello_message(message: types.Message): log_type = "Start_Button" text_message = f"Привет, я бот. А ты кто?" - name = find_chat_id(message) + name = find_imp_id(message.from_user.id) message_type = types_message(message) await message.reply( @@ -22,8 +27,7 @@ async def hello_message(message: types.Message): ) await common_msg_logginger(message, name, message_type, log_type) - return text_message - + await msg_default(message) # Ответ бота на кнопку или сообщение: "Помощь!" @@ -31,7 +35,7 @@ async def hello_message(message: types.Message): async def help_message(message: types.Message): log_type = "Help_Button" text_message = f"Привет, я надеюсь помогу тебе... Лучше напиши /help.." - name = find_chat_id(message) + name = find_imp_id(message.from_user.id) message_type = types_message(message) await message.reply( @@ -39,7 +43,7 @@ async def help_message(message: types.Message): ) await common_msg_logginger(message, name, message_type, log_type) - return text_message + await msg_default(message) # Ответ бота на кнопку или сообщение: "Пока-пока!" @@ -47,7 +51,7 @@ async def help_message(message: types.Message): async def bye_message(message: types.Message): log_type = "Messages" text_message = f"Надеюсь скоро увидимся! Захочешь поговорить нажми на /start!" - name = find_chat_id(message) + name = find_imp_id(message.from_user.id) message_type = types_message(message) await message.reply( @@ -56,15 +60,15 @@ async def bye_message(message: types.Message): ) await common_msg_logginger(message, name, message_type, log_type) - return text_message + await msg_default(message) # Ответ бота на сообщение: "Кошмар" @router.message(F.text.lower() == "кошмар") async def scary_message(message: types.Message): - log_type = "Messages" + log_type = "Scary" text_message = f"Кошмар, тот еще!" - name = find_chat_id(message) + name = find_imp_id(message.from_user.id) message_type = types_message(message) await message.reply( @@ -72,4 +76,4 @@ async def scary_message(message: types.Message): ) await common_msg_logginger(message, name, message_type, log_type) - return text_message + await msg_default(message)