From 0aa9a4eb5928848a2a6ce398e427b615890eef9c Mon Sep 17 00:00:00 2001 From: Verum Date: Mon, 24 Feb 2025 01:05:29 +0700 Subject: [PATCH] =?UTF-8?q?1.2.1=20=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotCode/keyboards/inline_kb/start_inline_kb.py | 5 +++-- BotCode/routers/commands/cmd_class/user_cmd_class.py | 2 +- BotLibrary/system/bots.py | 1 - ProjectsFiles/configs/config.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BotCode/keyboards/inline_kb/start_inline_kb.py b/BotCode/keyboards/inline_kb/start_inline_kb.py index ed51029..6501037 100644 --- a/BotCode/keyboards/inline_kb/start_inline_kb.py +++ b/BotCode/keyboards/inline_kb/start_inline_kb.py @@ -2,14 +2,15 @@ # Создания инлайн-клавиатуры на команду: /start from aiogram.types import InlineKeyboardMarkup -from BotLibrary import ikb +from aiogram.utils.keyboard import InlineKeyboardBuilder # Создание роутера и настройка экспорта __all__ = ("get_start_kb",) - # Функция создания клавиатуры на команду: /actor def get_start_kb() -> InlineKeyboardMarkup: + ikb = InlineKeyboardBuilder() + # Добавляем кнопки, группируя их по строкам ikb.button(text="Посмотреть инфо-канал", url="https://t.me/laveilinfo") ikb.button(text="Отправить анкету", url="https://t.me/laveilinfo") diff --git a/BotCode/routers/commands/cmd_class/user_cmd_class.py b/BotCode/routers/commands/cmd_class/user_cmd_class.py index 19a76ec..eecbbd1 100644 --- a/BotCode/routers/commands/cmd_class/user_cmd_class.py +++ b/BotCode/routers/commands/cmd_class/user_cmd_class.py @@ -51,4 +51,4 @@ class CommandHandler: # Проверка на ошибку except Exception as e: - Logs.error(log_type=self.name.capitalize(), text=f"Ошибка команды: {e}") + Logs.error(log_type=self.name.capitalize(), user=message.from_user.username, text=f"Ошибка команды: {e}") diff --git a/BotLibrary/system/bots.py b/BotLibrary/system/bots.py index 02af4e1..b27ae88 100644 --- a/BotLibrary/system/bots.py +++ b/BotLibrary/system/bots.py @@ -5,7 +5,6 @@ from aiogram import Dispatcher, Bot, F from aiogram.enums import ParseMode from aiogram.client.default import DefaultBotProperties from aiogram.utils.keyboard import InlineKeyboardBuilder, ReplyKeyboardBuilder -from aiogram.types import Bot as BotType from ..timer import get_host_time, get_moscow_time from ProjectsFiles import bot_token, BotVar diff --git a/ProjectsFiles/configs/config.py b/ProjectsFiles/configs/config.py index 791003f..033e173 100644 --- a/ProjectsFiles/configs/config.py +++ b/ProjectsFiles/configs/config.py @@ -118,7 +118,7 @@ class BotLogs: # Шаблон логов для предупреждений warning_text : str = ( "{time:YYYY-MM-DD HH:mm:ss} | " - "WARNING-{extra[log_type]} | " + "WARNING-{extra[log_type]} | " "{extra[user]} | {message}" )