From fb000890bb400b2e2ac8b0f31ed5cf687c6efa51 Mon Sep 17 00:00:00 2001 From: Verum Date: Tue, 25 Feb 2025 17:38:33 +0700 Subject: [PATCH] =?UTF-8?q?1.1.7=20=D1=8F=20=D0=B5=D0=B1=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=B1=D0=BB=D1=8F=D1=82=D1=8C=20=D0=BF=D0=B8=D1=81=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BA=D0=BE=D0=BC=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BotLibrary/loggers/start_info_out.py | 6 +++--- BotLibrary/samples/user_cmd_class.py | 8 +++----- BotLibrary/system/bots.py | 1 + ProjectsFiles/configs/primoenv.py | 1 + ProjectsFiles/configs/project_path.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BotLibrary/loggers/start_info_out.py b/BotLibrary/loggers/start_info_out.py index 4f0c929..13dd648 100644 --- a/BotLibrary/loggers/start_info_out.py +++ b/BotLibrary/loggers/start_info_out.py @@ -4,7 +4,7 @@ from time import sleep from colorama import Fore -from ProjectsFiles import Permissions, ProjectPath, BotVar +from ProjectsFiles import Permissions, ProjectPath, BotVar, bot_owner from .custom_loggers import Logs from ..system import BotInfo @@ -18,7 +18,7 @@ def bot_info_out() -> str: try: # Собираем данные о боте bot_name: str = f"Основное имя: {BotInfo.first_name}\n" - bot_post_name: str = f"Доп. имя: {BotInfo.last_name}\n" + bot_post_name: str = f"Владельцы бота: {bot_owner}\n" bot_username: str = f"Юзернейм: @{BotInfo.username}\n" bot_id: str = f"ID: {BotInfo.id}\n" bot_can_join_groups: str = f"Может ли вступать в группы: {BotInfo.can_join_groups}\n" @@ -45,4 +45,4 @@ def bot_info_out() -> str: return bot_all_info except Exception as e: - Logs.error(log_type="INFO", user="Start_INFO", text=f"Ошибка при получении ID пользователя: {e}") + Logs.error(log_type="SYS", user="Start_INFO", text=f"Ошибка при получении ID пользователя: {e}") diff --git a/BotLibrary/samples/user_cmd_class.py b/BotLibrary/samples/user_cmd_class.py index 49be277..7ebe68d 100644 --- a/BotLibrary/samples/user_cmd_class.py +++ b/BotLibrary/samples/user_cmd_class.py @@ -6,9 +6,8 @@ from aiogram.enums import ChatAction from aiogram.filters import Command from aiogram.types import InputMediaPhoto -from BotLibrary import valid_url +from BotLibrary import Logs, valid_url, username from ProjectsFiles import BotVar -from BotLibrary.loggers import Logs # Настройки экспорта в модули __all__ = ("CommandHandler",) @@ -70,7 +69,7 @@ class CommandHandler: if self.tg_links: self.text_msg = self.text_msg.replace("", str(message.from_user.id)) - Logs.info(log_type=self.log_type, text=f"использовал(а) команду /{self.name}") + Logs.info(log_type=self.log_type, user=username(message), text=f"использовал(а) команду /{self.name}") if self.media == "message": await message.reply( @@ -290,7 +289,6 @@ class CommandHandler: action=ChatAction.CHOOSE_STICKER, ) - # Проверка на ошибку except Exception as e: - Logs.error(log_type=self.log_type, text=f"Ошибка команды: {e}") + Logs.error(log_type=self.log_type, user=username(message), text=f"Ошибка команды: {e}") diff --git a/BotLibrary/system/bots.py b/BotLibrary/system/bots.py index cb113a1..703de91 100644 --- a/BotLibrary/system/bots.py +++ b/BotLibrary/system/bots.py @@ -58,6 +58,7 @@ class BotInfo: """ id: int = None first_name: str = None + bot_owner: str = BotVar last_name: str = None username: str = None description: str = None diff --git a/ProjectsFiles/configs/primoenv.py b/ProjectsFiles/configs/primoenv.py index ce1176c..7998cf9 100644 --- a/ProjectsFiles/configs/primoenv.py +++ b/ProjectsFiles/configs/primoenv.py @@ -24,6 +24,7 @@ tg_api_hash = getenv("TG_API_HASH") admin_id = getenv("ADMIN_ID") moderator_id = getenv("MODERATOR_ID") tech_id = getenv("MYID") +bot_owner = getenv("OWNER") # Айди пользователей, группы и канала important_id = getenv("IMPORTANT_ID") diff --git a/ProjectsFiles/configs/project_path.py b/ProjectsFiles/configs/project_path.py index 4cce6b8..a25550b 100644 --- a/ProjectsFiles/configs/project_path.py +++ b/ProjectsFiles/configs/project_path.py @@ -35,8 +35,8 @@ class ProjectPath: Класс для хранения путей к проектам и логам. """ BotLogs : str = "BotLogs" - bot_info_log_file: str = f"{BotLogs}/bot_info.log" - start_log_file: str = f"{BotLogs}/start.log" + bot_info_log_file: str = f"{BotLogs}/bot_info.logs" + start_log_file: str = f"{BotLogs}/start.logs" debug_log_file: str = f"{BotLogs}/debug.log" info_log_file : str = f"{BotLogs}/info.log" warning_log_file: str = f"{BotLogs}/warning.log"