diff --git a/bot.py b/bot.py
index 48e21d5f..707bb741 100644
--- a/bot.py
+++ b/bot.py
@@ -1,7 +1,7 @@
from aiogram import Bot, Dispatcher, Router
from aiogram.fsm.storage.memory import MemoryStorage
-from config import API_TOKEN
+from config import API_TOKEN,YOOKASSA_ENABLE,FREEKASSA_ENABLE
bot = Bot(token=API_TOKEN)
storage = MemoryStorage()
@@ -23,8 +23,10 @@ dp.include_router(start.router)
dp.include_router(profile.router)
dp.include_router(keys.router)
dp.include_router(key_management.router)
-dp.include_router(yookassa_pay.router)
-dp.include_router(freekassa_pay.router)
+if YOOKASSA_ENABLE:
+ dp.include_router(yookassa_pay.router)
+if FREEKASSA_ENABLE:
+ dp.include_router(freekassa_pay.router)
dp.include_router(notifications.router)
dp.message.middleware(AdminMiddleware())
diff --git a/handlers/admin/admin.py b/handlers/admin/admin.py
index fa41353f..fb3ee279 100644
--- a/handlers/admin/admin.py
+++ b/handlers/admin/admin.py
@@ -7,7 +7,7 @@ from loguru import logger
from auth import login_with_credentials
from client import extend_client_key_admin
-from config import ADMIN_IDS, ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL
from database import (
add_balance_to_client,
check_connection_exists,
diff --git a/handlers/profile.py b/handlers/profile.py
index 4646d5ec..c2617b4a 100644
--- a/handlers/profile.py
+++ b/handlers/profile.py
@@ -8,10 +8,9 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
from loguru import logger
from bot import bot
-from config import PAYMENT_METHOD
+from config import PAYMENT_METHOD,CHANNEL_URL
from database import get_balance, get_key_count, get_referral_stats
from handlers.texts import (
- CHANNEL_LINK,
get_referral_link,
invite_message_send,
profile_message_send,
@@ -36,7 +35,7 @@ async def process_callback_view_profile(
profile_message = profile_message_send(username, chat_id, balance, key_count)
- profile_message += f"Обязательно подпишитесь на канал здесь\n"
+ profile_message += f"Обязательно подпишитесь на канал здесь\n"
if key_count == 0:
profile_message += (
diff --git a/middlewares/admin.py b/middlewares/admin.py
index 91b1cdce..6c6fccf1 100644
--- a/middlewares/admin.py
+++ b/middlewares/admin.py
@@ -21,7 +21,7 @@ class AdminMiddleware(BaseMiddleware):
elif isinstance(event, CallbackQuery):
user_id = event.from_user.id
- if user_id not in int(ADMIN_ID):
+ if user_id != int(ADMIN_ID):
data["is_admin"] = False
else:
data["is_admin"] = True