From c780b1ffd75c7de56a6640839be1c3476bd5aebb Mon Sep 17 00:00:00 2001 From: crell2100 Date: Sun, 15 Dec 2024 18:07:52 +0300 Subject: [PATCH 1/3] add CHANEL_EXISTS variable --- handlers/start.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/handlers/start.py b/handlers/start.py index 3c15d9bc..9d168326 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -7,7 +7,7 @@ from aiogram.fsm.context import FSMContext from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder -from config import CHANNEL_URL, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL +from config import CHANNEL_URL, CHANNEL_EXISTS, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial from handlers.keys.trial_key import create_trial_key from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn @@ -40,10 +40,15 @@ async def start_command(message: Message, state: FSMContext, session: Any, admin builder.row(InlineKeyboardButton(text="🔗 Подключить VPN", callback_data="connect_vpn")) builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")) - builder.row( - InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL), - InlineKeyboardButton(text="📢 Канал", url=CHANNEL_URL), - ) + if CHANNEL_EXISTS: + builder.row( + InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL), + InlineKeyboardButton(text="📢 Канал", url=CHANNEL_URL), + ) + else: + builder.row( + InlineKeyboardButton(text="📞 Поддержка", url=SUPPORT_CHAT_URL) + ) if admin: builder.row(InlineKeyboardButton(text="🔧 Администратор", callback_data="admin")) @@ -111,9 +116,10 @@ async def handle_about_vpn(callback_query: CallbackQuery): builder.row( InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL), ) - builder.row( - InlineKeyboardButton(text="📢 Официальный канал", url=CHANNEL_URL), - ) + if CHANNEL_EXISTS: + builder.row( + InlineKeyboardButton(text="📢 Официальный канал", url=CHANNEL_URL), + ) builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="start")) await callback_query.message.answer(get_about_vpn("3.2.2-Release"), reply_markup=builder.as_markup()) From 051714e613ef5690fbbce60a71cbe15c73c2c14f Mon Sep 17 00:00:00 2001 From: crell2100 Date: Sun, 15 Dec 2024 22:30:20 +0300 Subject: [PATCH 2/3] add DONATS_ENABLE variable --- handlers/pay.py | 5 +++-- handlers/start.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/handlers/pay.py b/handlers/pay.py index bd709cd0..cf14b019 100644 --- a/handlers/pay.py +++ b/handlers/pay.py @@ -2,7 +2,7 @@ from aiogram import F, Router from aiogram.types import CallbackQuery, InlineKeyboardButton from aiogram.utils.keyboard import InlineKeyboardBuilder -from config import CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE +from config import CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE, DONATS_ENABLE router = Router() @@ -47,7 +47,8 @@ async def handle_pay(callback_query: CallbackQuery): ) ) builder.row(InlineKeyboardButton(text="🎟️ Активировать купон", callback_data="activate_coupon")) - builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) + if DONATS_ENABLE: + builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")) await callback_query.message.answer( diff --git a/handlers/start.py b/handlers/start.py index 9d168326..5b6ca641 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -7,7 +7,7 @@ from aiogram.fsm.context import FSMContext from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message from aiogram.utils.keyboard import InlineKeyboardBuilder -from config import CHANNEL_URL, CHANNEL_EXISTS, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL +from config import CHANNEL_URL, CHANNEL_EXISTS, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL,DONATS_ENABLE from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial from handlers.keys.trial_key import create_trial_key from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn @@ -112,7 +112,8 @@ async def handle_connect_vpn(callback_query: CallbackQuery, session: Any): @router.callback_query(F.data == "about_vpn") async def handle_about_vpn(callback_query: CallbackQuery): builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) + if DONATS_ENABLE: + builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) builder.row( InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL), ) From 0b0b002c8232266c4687d3f90655680d411c9db6 Mon Sep 17 00:00:00 2001 From: crell2100 Date: Mon, 16 Dec 2024 16:40:01 +0300 Subject: [PATCH 3/3] donats_enable->donations_enable (rename variable) --- handlers/pay.py | 4 ++-- handlers/start.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handlers/pay.py b/handlers/pay.py index 88155f36..6a9c66e9 100644 --- a/handlers/pay.py +++ b/handlers/pay.py @@ -3,7 +3,7 @@ from aiogram.types import CallbackQuery, InlineKeyboardButton from aiogram.utils.keyboard import InlineKeyboardBuilder -from config import CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE, DONATS_ENABLE, YOOMONEY_ENABLE +from config import CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE, DONATIONS_ENABLE, YOOMONEY_ENABLE router = Router() @@ -57,7 +57,7 @@ async def handle_pay(callback_query: CallbackQuery): ) builder.row(InlineKeyboardButton(text="🎟️ Активировать купон", callback_data="activate_coupon")) - if DONATS_ENABLE: + if DONATIONS_ENABLE: builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")) diff --git a/handlers/start.py b/handlers/start.py index 243c14e3..b13d27c9 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -12,7 +12,7 @@ from aiogram.types import ( ) from aiogram.utils.keyboard import InlineKeyboardBuilder -from config import CHANNEL_URL, CHANNEL_EXISTS, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL,DONATS_ENABLE +from config import CHANNEL_URL, CHANNEL_EXISTS, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL,DONATIONS_ENABLE from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial from handlers.keys.trial_key import create_trial_key @@ -133,7 +133,7 @@ async def handle_connect_vpn(callback_query: CallbackQuery, session: Any): async def handle_about_vpn(callback_query: CallbackQuery): builder = InlineKeyboardBuilder() - if DONATS_ENABLE: + if DONATIONS_ENABLE: builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")) builder.row(