1.1.7 я ебал блять писать комиты

This commit is contained in:
Verum
2025-02-25 17:38:33 +07:00
parent f0fdf8533f
commit fb000890bb
5 changed files with 10 additions and 10 deletions

View File

@@ -4,7 +4,7 @@
from time import sleep from time import sleep
from colorama import Fore from colorama import Fore
from ProjectsFiles import Permissions, ProjectPath, BotVar from ProjectsFiles import Permissions, ProjectPath, BotVar, bot_owner
from .custom_loggers import Logs from .custom_loggers import Logs
from ..system import BotInfo from ..system import BotInfo
@@ -18,7 +18,7 @@ def bot_info_out() -> str:
try: try:
# Собираем данные о боте # Собираем данные о боте
bot_name: str = f"Основное имя: {BotInfo.first_name}\n" 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_username: str = f"Юзернейм: @{BotInfo.username}\n"
bot_id: str = f"ID: {BotInfo.id}\n" bot_id: str = f"ID: {BotInfo.id}\n"
bot_can_join_groups: str = f"Может ли вступать в группы: {BotInfo.can_join_groups}\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 return bot_all_info
except Exception as e: 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}")

View File

@@ -6,9 +6,8 @@ from aiogram.enums import ChatAction
from aiogram.filters import Command from aiogram.filters import Command
from aiogram.types import InputMediaPhoto from aiogram.types import InputMediaPhoto
from BotLibrary import valid_url from BotLibrary import Logs, valid_url, username
from ProjectsFiles import BotVar from ProjectsFiles import BotVar
from BotLibrary.loggers import Logs
# Настройки экспорта в модули # Настройки экспорта в модули
__all__ = ("CommandHandler",) __all__ = ("CommandHandler",)
@@ -70,7 +69,7 @@ class CommandHandler:
if self.tg_links: if self.tg_links:
self.text_msg = self.text_msg.replace("<users>", str(message.from_user.id)) self.text_msg = self.text_msg.replace("<users>", 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": if self.media == "message":
await message.reply( await message.reply(
@@ -290,7 +289,6 @@ class CommandHandler:
action=ChatAction.CHOOSE_STICKER, action=ChatAction.CHOOSE_STICKER,
) )
# Проверка на ошибку # Проверка на ошибку
except Exception as e: 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}")

View File

@@ -58,6 +58,7 @@ class BotInfo:
""" """
id: int = None id: int = None
first_name: str = None first_name: str = None
bot_owner: str = BotVar
last_name: str = None last_name: str = None
username: str = None username: str = None
description: str = None description: str = None

View File

@@ -24,6 +24,7 @@ tg_api_hash = getenv("TG_API_HASH")
admin_id = getenv("ADMIN_ID") admin_id = getenv("ADMIN_ID")
moderator_id = getenv("MODERATOR_ID") moderator_id = getenv("MODERATOR_ID")
tech_id = getenv("MYID") tech_id = getenv("MYID")
bot_owner = getenv("OWNER")
# Айди пользователей, группы и канала # Айди пользователей, группы и канала
important_id = getenv("IMPORTANT_ID") important_id = getenv("IMPORTANT_ID")

View File

@@ -35,8 +35,8 @@ class ProjectPath:
Класс для хранения путей к проектам и логам. Класс для хранения путей к проектам и логам.
""" """
BotLogs : str = "BotLogs" BotLogs : str = "BotLogs"
bot_info_log_file: str = f"{BotLogs}/bot_info.log" bot_info_log_file: str = f"{BotLogs}/bot_info.logs"
start_log_file: str = f"{BotLogs}/start.log" start_log_file: str = f"{BotLogs}/start.logs"
debug_log_file: str = f"{BotLogs}/debug.log" debug_log_file: str = f"{BotLogs}/debug.log"
info_log_file : str = f"{BotLogs}/info.log" info_log_file : str = f"{BotLogs}/info.log"
warning_log_file: str = f"{BotLogs}/warning.log" warning_log_file: str = f"{BotLogs}/warning.log"