From dd79c6a709c129058a01d06c73a9d0649da61ff9 Mon Sep 17 00:00:00 2001 From: hteppl Date: Sun, 8 Dec 2024 05:11:31 +0300 Subject: [PATCH] Move keys utils into utils folder --- handlers/admin/admin_user_editor.py | 2 +- handlers/keys/key_management.py | 2 +- handlers/keys/keys.py | 2 +- handlers/notifications.py | 2 +- handlers/start.py | 2 +- {handlers => utils}/keys/key_utils.py | 0 {handlers => utils}/keys/subscriptions.py | 0 {handlers => utils}/keys/trial_key.py | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename {handlers => utils}/keys/key_utils.py (100%) rename {handlers => utils}/keys/subscriptions.py (100%) rename {handlers => utils}/keys/trial_key.py (100%) diff --git a/handlers/admin/admin_user_editor.py b/handlers/admin/admin_user_editor.py index 8d868b73..d840a875 100644 --- a/handlers/admin/admin_user_editor.py +++ b/handlers/admin/admin_user_editor.py @@ -11,7 +11,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder from config import TOTAL_GB from utils.database import get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry from filters.admin import IsAdminFilter -from handlers.keys.key_utils import delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster +from utils.keys.key_utils import delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster from utils.utils import sanitize_key_name from logger import logger diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index bc4396da..1c417788 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -20,7 +20,7 @@ from config import ( TRIAL_TIME, ) from utils.database import get_balance, get_trial, store_key, update_balance -from handlers.keys.key_utils import create_key_on_cluster +from utils.keys.key_utils import create_key_on_cluster from handlers.texts import DISCOUNTS, KEY, key_message_success from utils.utils import generate_random_email, get_least_loaded_cluster from logger import logger diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 30ffd7b0..e75c1c30 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -10,7 +10,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder from config import CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, PUBLIC_LINK, RENEWAL_PLANS, TOTAL_GB from utils.database import delete_key, get_balance, get_servers_from_db, store_key, update_balance, update_key_expiry -from handlers.keys.key_utils import ( +from utils.keys.key_utils import ( delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster, diff --git a/handlers/notifications.py b/handlers/notifications.py index bbf6fe8e..68ae5909 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -16,7 +16,7 @@ from utils.database import ( update_balance, update_key_expiry, ) -from handlers.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster +from utils.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster from handlers.texts import KEY_EXPIRY_10H, KEY_EXPIRY_24H, KEY_RENEWED from logger import logger diff --git a/handlers/start.py b/handlers/start.py index 00a27dda..3f678978 100644 --- a/handlers/start.py +++ b/handlers/start.py @@ -9,7 +9,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder from config import CHANNEL_URL, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL from utils.database import add_connection, add_referral, check_connection_exists, get_trial, use_trial -from handlers.keys.trial_key import create_trial_key +from utils.keys.trial_key import create_trial_key from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn router = Router() diff --git a/handlers/keys/key_utils.py b/utils/keys/key_utils.py similarity index 100% rename from handlers/keys/key_utils.py rename to utils/keys/key_utils.py diff --git a/handlers/keys/subscriptions.py b/utils/keys/subscriptions.py similarity index 100% rename from handlers/keys/subscriptions.py rename to utils/keys/subscriptions.py diff --git a/handlers/keys/trial_key.py b/utils/keys/trial_key.py similarity index 100% rename from handlers/keys/trial_key.py rename to utils/keys/trial_key.py