HOT_FIX_2 for handle_start_message

database/db.py

@@ -1,10 +1,7 @@
 import sqlite3
 import os
 from datetime import datetime
-from logs.custom_logger import Logger
-
-# Инициализируем логгер
-db_logger = Logger(name='db')
+from logs.custom_logger import logger
 
 # Получение абсолютного пути к текущей директории
 current_dir = os.getcwd()
@@ -15,7 +12,7 @@ class BotDB:
         self.db_file = os.path.join(current_dir, name)
         self.conn = None
         self.cursor = None
-        self.logger = db_logger.get_logger()
+        self.logger = logger
         self.logger.info(f'Подключен к базе данных: {self.db_file}')
 
     def connect(self):

helper_bot/handlers/admin/__init__.py

@@ -1 +1 @@
-from .main import admin_router
+from .admin_handlers import admin_router

helper_bot/handlers/admin/admin_handlers.py

@@ -9,15 +9,12 @@ from helper_bot.keyboards.main import get_reply_keyboard_admin, create_keyboard_
     create_keyboard_for_ban_days, create_keyboard_for_approve_ban
 from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
 from helper_bot.utils.helper_func import check_access, add_days_to_date, get_banned_users_buttons, get_banned_users_list
-from logs.custom_logger import Logger
+from logs.custom_logger import logger
 
 from database.db import BotDB
 
 admin_router = Router()
 
-#Инициализируем логгер
-admin_logger = Logger(name='admin_handler')
-logger = admin_logger.get_logger()
 
 bdf = BaseDependencyFactory()
 GROUP_FOR_POST = bdf.settings['Telegram']['group_for_posts']

helper_bot/handlers/callback/__init__.py

@@ -1 +1 @@
-from .main import callback_router
+from .callback_handlers import callback_router

helper_bot/handlers/callback/callback_handlers.py

@@ -10,14 +10,10 @@ from helper_bot.keyboards.main import create_keyboard_with_pagination, get_reply
 from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
 from helper_bot.utils.helper_func import send_text_message, send_photo_message, get_banned_users_list, \
     get_banned_users_buttons, delete_user_blacklist, get_help_message_id, send_media_group_message
-from logs.custom_logger import Logger
+from logs.custom_logger import logger
 
 callback_router = Router()
 
-#Инициализируем логгер
-callback_logger = Logger(name='callback_logger')
-logger = callback_logger.get_logger()
-
 bdf = BaseDependencyFactory()
 GROUP_FOR_POST = bdf.settings['Telegram']['group_for_posts']
 GROUP_FOR_MESSAGE = bdf.settings['Telegram']['group_for_message']

helper_bot/handlers/group/__init__.py

@@ -1 +1 @@
-from .main import group_router
+from .group_handlers import group_router

helper_bot/handlers/group/group_handlers.py

@@ -6,13 +6,10 @@ from helper_bot.filters.main import ChatTypeFilter
 from helper_bot.keyboards.main import get_reply_keyboard_leave_chat
 from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
 from helper_bot.utils.helper_func import send_text_message
-from logs.custom_logger import Logger
+
 
 group_router = Router()
 
-#Инициализируем логгер
-group_logger = Logger(name='group_logger')
-logger = group_logger.get_logger()
 
 bdf = BaseDependencyFactory()
 GROUP_FOR_POST = bdf.settings['Telegram']['group_for_posts']

helper_bot/handlers/private/__init__.py

@@ -1 +1 @@
-from .main import private_router
+from .private_handlers import private_router

helper_bot/handlers/private/private_handlers.py

@@ -17,7 +17,7 @@ from helper_bot.utils import messages
 from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
 from helper_bot.utils.helper_func import get_first_name, get_text_message, send_text_message, send_photo_message, \
     process_photo_album, send_media_group_message, check_username_and_full_name
-from logs.custom_logger import Logger
+from logs.custom_logger import logger
 
 from database.db import BotDB
 
@@ -25,9 +25,6 @@ private_router = Router()
 
 private_router.message.middleware(AlbumMiddleware())
 
-#Инициализируем логгер
-private_logger = Logger(name='private_handler')
-logger = private_logger.get_logger()
 
 bdf = BaseDependencyFactory()
 GROUP_FOR_POST = bdf.settings['Telegram']['group_for_posts']

helper_bot/utils/helper_func.py

@@ -177,7 +177,7 @@ def delete_user_blacklist(user_id: int):
 
 def check_username_and_full_name(user_id: int, username: str, full_name: str):
     username_db, full_name_db = BotDB.get_username_and_full_name(user_id=user_id)
-    return not username == username_db and full_name == full_name_db
+    return username != username_db or full_name != full_name_db
 
 
 def unban_notifier(self):

logs/custom_logger.py

@@ -1,45 +1,25 @@
 import datetime
 import os
-import loguru
+from loguru import logger
 
 
-class Logger:
-    def __init__(self, name):
-        self.logger = loguru.logger.bind(name=name)
+logger = logger.bind(name='main_log')
 
-        # Получение сегодняшней даты для имени файла
-        today = datetime.date.today().strftime('%Y-%m-%d')
+# Получение сегодняшней даты для имени файла
+today = datetime.date.today().strftime('%Y-%m-%d')
 
-        # Создание папки для логов
-        current_dir = os.path.dirname(os.path.abspath(__file__))
-        if not os.path.exists(current_dir):
+# Создание папки для логов
+current_dir = os.path.dirname(os.path.abspath(__file__))
+if not os.path.exists(current_dir):
     # Если не существует, создаем ее
     os.makedirs(current_dir)
-        filename = f'{current_dir}/helper_bot_{today}.log'
+filename = f'{current_dir}/helper_bot_{today}.log'
 
-        # Настройка формата логов
-        self.logger.add(
+# Настройка формата логов
+logger.add(
     filename,
     rotation="00:00",
     retention="5 days",
     compression="zip",
     format="{time:YYYY-MM-DD at HH:mm:ss} | {level} | {name} | {line} | {message}",
-        )
-
-    def get_logger(self):
-        return self.logger
-
-    def info(self, message):
-        self.logger.info(message)
-
-    def debug(self, message):
-        self.logger.debug(message)
-
-    def warning(self, message):
-        self.logger.warning(message)
-
-    def error(self, message):
-        self.logger.error(message)
-
-    def critical(self, message):
-        self.logger.critical(message)
+)