WIP: Temporary commit for branch move

helper_bot/handlers/callback/callback_handlers.py

@@ -7,7 +7,7 @@ from aiogram.types import CallbackQuery
 
 from helper_bot.keyboards.keyboards import create_keyboard_with_pagination, get_reply_keyboard_admin, \
     create_keyboard_for_ban_reason
-from helper_bot.utils.base_dependency_factory import BaseDependencyFactory
+from helper_bot.utils.base_dependency_factory import get_global_instance
 from helper_bot.utils.helper_func import send_text_message, send_photo_message, get_banned_users_list, \
     get_banned_users_buttons, delete_user_blacklist, send_media_group_to_channel, \
     send_video_message, send_video_note_message, send_audio_message, send_voice_message
@@ -15,7 +15,7 @@ from logs.custom_logger import logger
 
 callback_router = Router()
 
-bdf = BaseDependencyFactory()
+bdf = get_global_instance()
 GROUP_FOR_POST = bdf.settings['Telegram']['group_for_posts']
 GROUP_FOR_MESSAGE = bdf.settings['Telegram']['group_for_message']
 MAIN_PUBLIC = bdf.settings['Telegram']['main_public']
@@ -237,7 +237,7 @@ async def process_ban_user(call: CallbackQuery, state: FSMContext):
 async def process_unlock_user(call: CallbackQuery):
     user_id = call.data[7:]
     user_name = BotDB.get_username(user_id=user_id)
-    delete_user_blacklist(user_id)
+    delete_user_blacklist(user_id, BotDB)
     logger.info(f"Разблокирован пользователь с ID: {user_id} username:{user_name}")
     username = BotDB.get_username(user_id)
     await call.answer(f'Пользователь разблокирован {username}', show_alert=True)
@@ -270,12 +270,12 @@ async def change_page(call: CallbackQuery):
                                                  reply_markup=keyboard)
     else:
         # Готовим сообщения
-        message_user = get_banned_users_list(int(page_number) * 7 - 7)
+        message_user = get_banned_users_list(int(page_number) * 7 - 7, BotDB)
         await call.bot.edit_message_text(chat_id=call.message.chat.id, message_id=call.message.message_id,
                                          text=message_user)
 
         # Готовим клавиатуру
-        buttons = get_banned_users_buttons()
+        buttons = get_banned_users_buttons(BotDB)
         keyboard = create_keyboard_with_pagination(int(call.data[5:]), len(buttons), buttons, 'unlock')
         await call.bot.edit_message_reply_markup(chat_id=call.message.chat.id, message_id=call.message.message_id,
                                                  reply_markup=keyboard)