Skip to content

Commit bd45b27

Browse files
BaggerFastBaggerFast
committed
REFACTOR: import
UPDATE: a new widget for payment
1 parent ab332e3 commit bd45b27

20 files changed

Lines changed: 117 additions & 102 deletions

File tree

‎run_user_bot.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/python
2-
# Need for normal directory path when telegram_bot start user_bot.
32
from user_bot import start_user_bot
43

54
if __name__ == '__main__':

‎telegram_bot/database/methods/create.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import sqlalchemy.exc
2-
from sqlalchemy import select
32

43
from telegram_bot.database.main import Database
54
from telegram_bot.database.models import User, Session, Payment

‎telegram_bot/database/methods/other.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
from sqlalchemy import select
2-
1+
from telegram_bot.database.models import User
32
from telegram_bot.database.main import Database
43
from telegram_bot.database.methods.create import create_user
54
from telegram_bot.database.methods.get import get_user_by_telegram_id
6-
from telegram_bot.database.models import User
75

86

97
def is_vip(telegram_id) -> bool:

‎telegram_bot/handlers/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from .main import register_all_handlers
1+
from .main import register_all_handlers

‎telegram_bot/handlers/admin/auth.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
from telegram_bot.database.methods.other import is_admin
66
from telegram_bot.database.methods.update import set_admin, set_vip
7+
78
from telegram_bot.utils.env import Env
8-
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
99
from telegram_bot.utils.states import AdminStates
10-
from telegram_bot.utils.util import get_main_keyboard, get_admin_keyboard
10+
from telegram_bot.keyboards import get_main_keyboard, get_admin_keyboard
11+
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
1112

1213

1314
async def __admin(msg: Message, state: FSMContext):

‎telegram_bot/handlers/admin/main.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
from contextlib import suppress
22

33
import loguru
4+
45
from aiogram import Dispatcher, Bot
5-
from aiogram.types import Message, CallbackQuery
66
from aiogram.dispatcher import FSMContext
7+
from aiogram.types import Message, CallbackQuery
78

8-
from telegram_bot.database.methods.get import get_all_telegram_id, \
9-
get_sessions_enable_count, get_user_count, get_sessions_count
109
from telegram_bot.database.methods.update import set_admin, set_vip
11-
from telegram_bot.handlers.admin.auth import _get_auth_handlers
10+
from telegram_bot.database.methods.get import get_all_telegram_id, get_sessions_enable_count, get_user_count, \
11+
get_sessions_count
12+
1213
from telegram_bot.handlers.admin.vip import _get_vip_handlers
13-
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
14+
from telegram_bot.handlers.admin.auth import _get_auth_handlers
15+
1416
from telegram_bot.utils.states import AdminStates
15-
from telegram_bot.utils.util import get_main_keyboard, get_admin_keyboard
17+
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
18+
from telegram_bot.keyboards import get_main_keyboard, get_admin_keyboard
1619

1720

1821
# region Add admin
@@ -94,7 +97,6 @@ async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
9497

9598

9699
def register_admin_handlers(dp: Dispatcher) -> None:
97-
98100
# region Msg handlers
99101

100102
dp.register_message_handler(__admin_insert_tg_id, content_types=['text'], state=AdminStates.INSERT_NEW_ADMIN)

‎telegram_bot/handlers/admin/vip.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from loguru import logger
2+
23
from aiogram import Dispatcher, Bot
34
from aiogram.dispatcher import FSMContext
45
from aiogram.types import Message, CallbackQuery
5-
from telegram_bot.database.methods.other import switch_vip
6+
67
from telegram_bot.database.methods.update import set_vip
7-
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists, check_process
8+
from telegram_bot.database.methods.other import switch_vip
9+
810
from telegram_bot.utils.states import AdminStates
9-
from telegram_bot.utils.util import get_main_keyboard, get_admin_keyboard
11+
from telegram_bot.keyboards import get_main_keyboard, get_admin_keyboard
12+
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists, check_process
1013

1114

1215
async def __vip_switcher(query: CallbackQuery, state: FSMContext):
@@ -27,7 +30,7 @@ async def __vip_insert_tg_id(msg: Message, state: FSMContext):
2730
bot: Bot = msg.bot
2831
user_id = msg.from_user.id
2932
other_user_id = int(msg.text)
30-
# todo remove Exception
33+
# todo remove Exception`
3134
try:
3235
set_vip(other_user_id)
3336
if check_process(user_id):

‎telegram_bot/handlers/user/buy_vip.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1+
from uuid import uuid4
2+
3+
from yookassa import Payment
14
from aiogram import Dispatcher, Bot
25
from aiogram.types import Message, CallbackQuery
3-
from yookassa import Payment
4-
from uuid import uuid4
6+
7+
from telegram_bot.database.methods.update import set_vip
58
from telegram_bot.database.methods.create import create_user_payment
69
from telegram_bot.database.methods.get import get_user_by_telegram_id
7-
from telegram_bot.database.methods.update import set_vip
10+
11+
from telegram_bot.utils.util import get_payment_info
812
from telegram_bot.handlers.user.util import _buy_vip_text
9-
from telegram_bot.utils import TgConfig
1013
from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
11-
from telegram_bot.utils.util import get_main_keyboard, get_payment_keyboard, get_payment_info
14+
from telegram_bot.keyboards import get_main_keyboard, get_payment_keyboard
1215

1316

1417
async def __buy_vip(msg: Message) -> None:

‎telegram_bot/handlers/user/main.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
from aiogram.types import Message, CallbackQuery
33

44
from misc import get_vip_commands_help, get_commands_help
5-
from telegram_bot.handlers.user.user_bot import _register_user_bot_handlers
65
from telegram_bot.handlers.user.buy_vip import _register_vip_handlers
7-
from ...database.methods.create import create_user
8-
from ...utils import TgConfig
9-
from ...utils.util import get_main_keyboard
10-
from ...keyboards import KB_INFO
6+
from telegram_bot.handlers.user.user_bot import _register_user_bot_handlers
7+
8+
from telegram_bot.utils import TgConfig
9+
from telegram_bot.database.methods.create import create_user
10+
from telegram_bot.keyboards import KB_INFO, get_main_keyboard
1111

1212

1313
async def __start(msg: Message) -> None:

‎telegram_bot/handlers/user/user_bot.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
from contextlib import suppress
21
from datetime import timedelta
3-
from aiogram import Dispatcher, Bot, types
4-
from aiogram.dispatcher import FSMContext
5-
from aiogram.types import Message, CallbackQuery
2+
from contextlib import suppress
3+
64
from loguru import logger
5+
76
from pyrogram import Client
87
from pyrogram.errors import SessionPasswordNeeded, PhoneCodeInvalid, FloodWait, PhoneCodeExpired, PasswordHashInvalid
98

9+
from aiogram import Dispatcher, Bot, types
10+
from aiogram.dispatcher import FSMContext
11+
from aiogram.types import Message, CallbackQuery
12+
1013
from misc.path import PathManager
1114
from telegram_bot.database.methods.create import create_session
1215
from telegram_bot.database.methods.delete import delete_session
1316
from telegram_bot.database.methods.get import get_user_by_telegram_id
1417

1518
from telegram_bot.utils import Env, CreateUserBotState
16-
from telegram_bot.utils.util import get_main_keyboard
17-
from telegram_bot.keyboards import KB_CONTACT, KB_CANCEL_SETUP
18-
from .util import _user_agreement_text
19-
from ...utils.process import start_process_if_sessions_exists, check_process, kill_process
19+
from telegram_bot.handlers.user.util import _user_agreement_text
20+
from telegram_bot.keyboards import KB_CONTACT, KB_CANCEL_SETUP, get_main_keyboard
21+
from telegram_bot.utils.process import start_process_if_sessions_exists, check_process, kill_process
2022

2123
__sessions: dict[int, Client] = {}
2224

0 commit comments

Comments
 (0)