From 11d30fe58b341253dbbfde49071f7d214a486461 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 25 Sep 2024 01:45:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B2=20=D0=B1=D0=B0=D0=B7=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/__pycache__/keys.cpython-310.pyc | Bin 9121 -> 7812 bytes handlers/__pycache__/pay.cpython-310.pyc | Bin 8628 -> 7951 bytes handlers/__pycache__/start.cpython-310.pyc | Bin 5162 -> 5163 bytes handlers/keys.py | 106 ++++++--------------- handlers/pay.py | 17 +--- key_management.py | 41 +------- main.py | 2 - 7 files changed, 36 insertions(+), 130 deletions(-) diff --git a/handlers/__pycache__/keys.cpython-310.pyc b/handlers/__pycache__/keys.cpython-310.pyc index 0ccaa853fc7414eef06dfe9e94f8e936a898d31a..3ae3ac58bda8432413e0623a515753eb74fe28d6 100644 GIT binary patch delta 1273 zcmaKrUuauZ9LLY^li=vWfYPM!d@gL4rEgV9~2*idwmco_@WQ8A^5Pj`k=qFw&)N{_$twDdIUHKFIK#A`2Mk+V~;oYEV6!)WXJ@j%{DM72w z$IfR?-MQy{?p}4@)1AA{J@zsmiW-~1_aa$2BBEI3Adla3yh( zmwIt5)QXpr*|u_I@2MAN$BOm|+f2)+dwPG_i?@@R^kX3>ZL^a?%p($6{3&^Qe2`q- zU2)f(?Vi4;#`}ZLmUG9s>#n)$PTjqs%dT;+I(3~IXO)~g?sZ!Kl4i8F-$YLRl-@Vq zZw^zgvR7s?&&nOn5lY?ENlE;mJvn)sn>i`x35BHjr1XzUXc8k51&J<+u*3xkF7XOs zCtyv_8H?7~+=A(oVvodeiHO8SiA%Vucc2w7;Q3S>=Tk4_Y?2rI2(ouI;L;!lUao)w z8hAbUAk_&|)R~7P<wZ>x;}Y_JWe!QaL@43I#E3FM zUIENk@y+ZA9Kr4EkBKNry7L8cvzI(LWsTX?anKbZpa%q^vf!q_g8Bby<*9%+tN$yaNbBO0szi6P+ zg;n~-AtSYT@DI8?k8ymE>wqOx@-M;!p2_#ef2MORdI@|b3+7333K^{CZ)&6Dnqv}E k5=%I6=-6@jf*O;R4f8P7Gfw8`VNVRgJ^QB8*hzNkZ@>&w6951J delta 2206 zcma)7U2IfE6uvY2clYn^?d@)VcDLK56lB{{Y(YUNC4_$=fNixxLe{pkly2K?xqDZj zxoZn05)ul*Av|aZZ8TA$CWVTC$deB~k=*6Mhke3mOo$;tBMAv8o^y9gi|}BZ`R<&V zGiT1seBasQYp1qILtd{-fWP4IANxJ4&Prjj`f`0KX-Je#`dN^`uk+L_0W z$HY!yn|qd-C(a(?$-C4^YJZ*XvehtrW60P1Ky4Yn*27np?N)6nYNb zp|-**53|j!A_B8##gvUX04Wo*qUKFX%*kBLJwdZhutt5lvzPP|1}DzCG&xzKi#pMT zq>?PvUCcXSEhIpMP65LEr-WHMB|dK-0*_RURnP)Q&JiK&Cc;P=#$%H1{zSMyXQMLT zgk?5Hr@%**^18CQs7!#@mv^c`xOWvVf26*B(~eCWI--feuD$_&Td5UC7Hx!~j!j@x zJ2DO6WPHqb2djL!@#0%wHEuO#Ho#MsH_ab2t{c})20#Z~a>tD6Xzqk@H8%$4wdnfY z+Zr>kb0b)_G726*nJBFO*0_qF0*NrNx(IXgA%qYj2vLAc6Ygj)ICEd9yzLTI7vO9S zK&)JS1^Y`7WP}cc7(yL_2jOi5JAxYlb)<>_c}L=Kq9>#AI`1<6$X{EYccc^Pbl*@4 zI+>mx=&LQ@$Deqs_f-$8LpT!e=^7a5?&|4}KTprY;FxX(KxWH?Vj~K%Qjxf*3%&}m zgSM;|31%X+7QPKc9HUPai`s`o=D*7e$wj2UBtaO=@&}B07b)EUl)m-?r9XQqrLXWK zCDBpfu%n--NzI+~Fb5NLiiBZK;HYSh0bfna36@tEdx=R}S|qKM^f9kVFQl)FN&g|O zGDojYP*}TwQOvkLCc|E%#m#z&IatD!xde)1rG*4QDVE}f0&iIaZa z&g>zmaFYR6Hbr2x{DLj((I83PGcU;sRykoS=%At~u6cQy;!^lJC9vi<5R=yw6P`1u zd!LC3#TA+_raf@FtoH*iDBk??GfFuL^UsxzYIP^PkGc!NB<*hOEk;24KIBg;+DMc? zQdTK>sZd6n;)6pe?La)!%>Py@dAu}Sn)el^mKUbdadi^a0K_EzkH6XZ9@?z{ zd|6<_8yBIIMt#1h5Ru44q<$(9KPZKQa_rDNPpI85TmR%du!tN)jfi=B;kNh#IYREB zSY{$+w`kKnf?I6?xM!A*B%1hBrEWub6QLi$JULO{<$EgIh>w3&`BMO^PSp4w?(Asp zOzy)aOJj}jJ`aK`ERC5}e5)n;m}j@7rg&FqpH1Bl?)=Bl zW-`R3aEJ`^x^T5i?Zq?>;MCecke`+nci~9G16`>*{G;%~b#QclB>1aLBq$yd{QF55 zF2%379>``P@xygV&>}D%q;#y-BF`0*G5%M06G`yZRjqy(Tua&td(p87QI|s}R>eXDnw3pL|V1kr7PF)-Wy*U&!Fekiy`> zz{pU;us{OAE8qN0;twNhQ3}wZo4ushF*2r3{wY% ZBn4t9OpZ}_KRHfOiBV^AqoOWQI{>8NN!tJb delta 898 zcmZ`$T}YEr7(VaW=9bNA)8?jAzo{uB)GmZF#Ii0dq7g_0b}`Je-*ndbHpG~2Q^BH^ z=pl$A(#s&EoRVeEi=eBL^WE+ugzoJ&h<@I0<%LKG-simMocHHB&pX$%dfql#R#r-I z^_1-fUv|vf+%PB%*?egIAM>+M9h zz0$2{8AVIWHTh1i$aVQfu4_~Bm3%MPPb;~G+GPMHw%tj@OLetCMX0XRWwOv3u!AvO zK^3S0OPc<&8STKQ7aZ=CYDYDaBuYjtIxYf(CH<$=m*~Y8`3!rl%Dk4*`=I5uS-C0m z$fHPOwfL~2V9bU#r^qe5&FcqD+eC76UdrpS4!?rng#wIlr+zGgi;xuIop|0wQz?R- z@N>8g0m9xgpkqe+fTngMWI(4Hg$an$xPbwq%#fua2mv!@VS>huD1a$R8DS;NoHgyq z&Io?Y;!8AO4fz~-Zpl<0sp>?hvOLQ@(VZr-UH7eApIpIw`7b*@E8f<( QzzMNa-&W!PYo7!D0Dj9s4gdfE diff --git a/handlers/__pycache__/start.cpython-310.pyc b/handlers/__pycache__/start.cpython-310.pyc index 79afa263ebd9ff04da97057659c8e2f8ea1e89f3..4348070429f3d0639335c2620e25d21808442ede 100644 GIT binary patch delta 44 xcmZ3bv08&SpO=@50SGF7e@qMA$m_@=@B_%x3eL~T_e(8Nc+@aub1chQegGx!4rBlT delta 43 wcmZ3ju}XtCpO=@50SN4Ve@qM6$m__${~gHF3eL~T_e(8N(AC`>$8we*00^lJi~s-t diff --git a/handlers/keys.py b/handlers/keys.py index d7029ace..af9e448f 100644 --- a/handlers/keys.py +++ b/handlers/keys.py @@ -29,7 +29,8 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery): for record in records: key_name = record['email'] client_id = record['client_id'] - button = types.InlineKeyboardButton(text=key_name, callback_data=f'view_key_{key_name}_{client_id}') + # Заменяем подчеркивание на вертикальную черту в callback_data + button = types.InlineKeyboardButton(text=key_name, callback_data=f'view_key|{key_name}|{client_id}') buttons.append([button]) # Создаем клавиатуру с кнопками @@ -58,10 +59,11 @@ async def process_callback_view_keys(callback_query: types.CallbackQuery): await callback_query.answer() -@router.callback_query(lambda c: c.data.startswith('view_key_')) +@router.callback_query(lambda c: c.data.startswith('view_key|')) async def process_callback_view_key(callback_query: types.CallbackQuery): tg_id = callback_query.from_user.id - key_name, client_id = callback_query.data.split('_')[2], callback_query.data.split('_')[3] + # Разделяем данные по вертикальной черте + key_name, client_id = callback_query.data.split('|')[1], callback_query.data.split('|')[2] try: conn = await asyncpg.connect(DATABASE_URL) @@ -85,9 +87,9 @@ async def process_callback_view_key(callback_query: types.CallbackQuery): f"{days_left_message}") # Кнопки для продления, инструкций и удаления - renew_button = types.InlineKeyboardButton(text='Продлить ключ', callback_data=f'renew_key_{client_id}') + renew_button = types.InlineKeyboardButton(text='Продлить ключ', callback_data=f'renew_key|{client_id}') instructions_button = types.InlineKeyboardButton(text='Инструкции по использованию', callback_data='instructions') - delete_button = types.InlineKeyboardButton(text='Удалить ключ', callback_data=f'delete_key_{client_id}') + delete_button = types.InlineKeyboardButton(text='Удалить ключ', callback_data=f'delete_key|{client_id}') back_button = types.InlineKeyboardButton(text='Назад в профиль', callback_data='view_profile') keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[renew_button], [instructions_button], [delete_button], [back_button]]) @@ -104,62 +106,25 @@ async def process_callback_view_key(callback_query: types.CallbackQuery): await callback_query.answer() # Обработка запроса на удаление ключа -@router.callback_query(lambda c: c.data.startswith('delete_key_')) +@router.callback_query(lambda c: c.data.startswith('delete_key|')) async def process_callback_delete_key(callback_query: types.CallbackQuery): tg_id = callback_query.from_user.id - client_id = callback_query.data.split('_')[2] + client_id = callback_query.data.split('|')[1] # Используем разделитель вертикальная черта confirmation_keyboard = types.InlineKeyboardMarkup(inline_keyboard=[ - [types.InlineKeyboardButton(text='Да, удалить', callback_data=f'confirm_delete_{client_id}')], + [types.InlineKeyboardButton(text='Да, удалить', callback_data=f'confirm_delete|{client_id}')], [types.InlineKeyboardButton(text='Нет, отменить', callback_data='view_keys')] ]) await bot.edit_message_text("Вы уверены, что хотите удалить ключ?", chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=confirmation_keyboard) await callback_query.answer() -@router.callback_query(lambda c: c.data.startswith('confirm_delete_')) -async def process_callback_confirm_delete(callback_query: types.CallbackQuery): - tg_id = callback_query.from_user.id - client_id = callback_query.data.split('_')[2] - try: - conn = await asyncpg.connect(DATABASE_URL) - try: - record = await conn.fetchrow('SELECT email FROM keys WHERE client_id = $1', client_id) - - if record: - email = record['email'] - - session = login_with_credentials(ADMIN_USERNAME, ADMIN_PASSWORD) - success = delete_client(session, client_id) - - if success: - await conn.execute('DELETE FROM keys WHERE client_id = $1', client_id) - response_message = "Ключ был успешно удален." - else: - response_message = "Ошибка при удалении клиента через API." - - else: - response_message = "Ключ не найден или уже удален." - - back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_keys') - keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[back_button]]) - - await bot.edit_message_text(response_message, chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard) - - finally: - await conn.close() - - except Exception as e: - await bot.edit_message_text(f"Ошибка при удалении ключа: {e}", chat_id=tg_id, message_id=callback_query.message.message_id) - - await callback_query.answer() - - -@router.callback_query(lambda c: c.data.startswith('renew_key_')) +# Подтверждение удаления +@router.callback_query(lambda c: c.data.startswith('renew_key|')) async def process_callback_renew_key(callback_query: types.CallbackQuery): tg_id = callback_query.from_user.id - client_id = callback_query.data.split('_')[2] + client_id = callback_query.data.split('|')[1] # Используем разделитель вертикальная черта try: conn = await asyncpg.connect(DATABASE_URL) @@ -169,32 +134,19 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery): if record: email = record['email'] expiry_time = record['expiry_time'] - current_time = datetime.utcnow().timestamp() * 1000 - - if expiry_time <= current_time: - # Кнопка для удаления ключа и возврата в профиль - delete_button = types.InlineKeyboardButton(text='Удалить ключ', callback_data=f'delete_key_{client_id}') - back_button = types.InlineKeyboardButton(text='Назад в профиль', callback_data='view_profile') - keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[delete_button], [back_button]]) - - await bot.edit_message_text( - "Ваш ключ уже истек и не может быть продлен.", - chat_id=tg_id, - message_id=callback_query.message.message_id, - reply_markup=keyboard - ) - return + current_time = datetime.utcnow().timestamp() * 1000 # Получаем текущее время в миллисекундах + # Убираем проверку на истекший ключ keyboard = types.InlineKeyboardMarkup(inline_keyboard=[ - [types.InlineKeyboardButton(text='Продлить на 1 месяц (100 руб.)', callback_data=f'renew_1_month_{client_id}')], - [types.InlineKeyboardButton(text='Продлить на 3 месяца (250 руб.)', callback_data=f'renew_3_months_{client_id}')], + [types.InlineKeyboardButton(text='Продлить на 1 месяц (100 руб.)', callback_data=f'renew_plan|1|{client_id}')], + [types.InlineKeyboardButton(text='Продлить на 3 месяца (250 руб.)', callback_data=f'renew_plan|3|{client_id}')], [types.InlineKeyboardButton(text='Назад', callback_data='view_profile')] ]) balance = await get_balance(tg_id) response_message = (f"Выберите план продления:\n" f"Баланс: {balance} руб.\n" - f"Действующий ключ истекает {datetime.utcfromtimestamp(expiry_time / 1000).strftime('%Y-%m-%d %H:%M:%S')}") + f"Текущая дата истечения ключа: {datetime.utcfromtimestamp(expiry_time / 1000).strftime('%Y-%m-%d %H:%M:%S')}") await bot.edit_message_text(response_message, chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard, parse_mode="HTML") @@ -207,10 +159,10 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery): await callback_query.answer() # Обработка выбора плана продления -@router.callback_query(lambda c: c.data.startswith('renew_')) +@router.callback_query(lambda c: c.data.startswith('renew_plan|')) async def process_callback_renew_plan(callback_query: types.CallbackQuery): tg_id = callback_query.from_user.id - plan, client_id = callback_query.data.split('_')[1], callback_query.data.split('_')[3] # '1' или '3' и client_id + plan, client_id = callback_query.data.split('|')[1], callback_query.data.split('|')[2] # '1' или '3' и client_id days_to_extend = 30 * int(plan) try: @@ -221,38 +173,42 @@ async def process_callback_renew_plan(callback_query: types.CallbackQuery): if record: email = record['email'] expiry_time = record['expiry_time'] - current_time = datetime.utcnow().timestamp() * 1000 + current_time = datetime.utcnow().timestamp() * 1000 # Текущее время в миллисекундах if expiry_time <= current_time: + # Если ключ уже истек, он не может быть продлен await bot.edit_message_text("Ваш ключ уже истек и не может быть продлен.", chat_id=tg_id, message_id=callback_query.message.message_id) return + # Рассчитываем новую дату истечения new_expiry_time = int(expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000) cost = 100 if plan == '1' else 250 balance = await get_balance(tg_id) if balance < cost: replenish_button = types.InlineKeyboardButton(text='Пополнить баланс', callback_data='replenish_balance') - back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_keys') + back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_profile') keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[replenish_button], [back_button]]) await bot.edit_message_text("Недостаточно средств для продления ключа.", chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard) return + # Продлеваем ключ через API session = login_with_credentials(ADMIN_USERNAME, ADMIN_PASSWORD) success = extend_client_key(session, tg_id, client_id, email, new_expiry_time) if success: + # Обновляем баланс и ключ в базе данных await update_balance(tg_id, -cost) await conn.execute('UPDATE keys SET expiry_time = $1 WHERE client_id = $2', new_expiry_time, client_id) - response_message = f"Ваш ключ был успешно продлен на {days_to_extend // 30} месяц(-)." - back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_keys') + response_message = f"Ваш ключ был успешно продлен на {days_to_extend // 30} месяц(-а)." + back_button = types.InlineKeyboardButton(text='Назад', callback_data='view_profile') keyboard = types.InlineKeyboardMarkup(inline_keyboard=[[back_button]]) await bot.edit_message_text(response_message, chat_id=tg_id, message_id=callback_query.message.message_id, reply_markup=keyboard) else: await bot.edit_message_text("Ошибка при продлении ключа.", chat_id=tg_id, message_id=callback_query.message.message_id) else: - await bot.edit_message_text("У вас нет ключей для продления.", chat_id=tg_id, message_id=callback_query.message.message_id) + await bot.edit_message_text("Ключ не найден.", chat_id=tg_id, message_id=callback_query.message.message_id) finally: await conn.close() @@ -262,7 +218,5 @@ async def process_callback_renew_plan(callback_query: types.CallbackQuery): await callback_query.answer() -# Обработка ошибок async def handle_error(tg_id, callback_query, message): - await bot.edit_message_text(message, chat_id=tg_id, message_id=callback_query.message.message_id) - + await bot.edit_message_text(message, chat_id=tg_id, message_id=callback_query.message.message_id) \ No newline at end of file diff --git a/handlers/pay.py b/handlers/pay.py index 5c31cdb1..1828e21f 100644 --- a/handlers/pay.py +++ b/handlers/pay.py @@ -217,10 +217,9 @@ async def process_admin_confirmation(callback_query: types.CallbackQuery, state: try: await bot.delete_message(chat_id=user_id, message_id=requisites_message_id) except Exception as e: - print(f"Ошибка при удалении сообщения с реквизитами: {e}") + print(f"Ошибка при удалении сообщения: {e}") finally: - # Закрываем соединение с базой данных await conn.close() elif action == 'decline': @@ -231,14 +230,6 @@ async def process_admin_confirmation(callback_query: types.CallbackQuery, state: await send_message_with_deletion(callback_query.from_user.id, f"Ошибка при пополнении баланса: {e}", state=state, message_key='admin_error_message_id') print(f"Ошибка при пополнении баланса: {e}") - await state.clear() - await callback_query.answer() - - -@router.message(lambda m: m.text and m.text.startswith('Недостаточно средств для продления')) -async def handle_insufficient_funds(message: types.Message): - user_id = message.from_user.id - replenish_keyboard = InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text='Пополнить баланс', callback_data='replenish_balance')] - ]) - await send_message_with_deletion(user_id, "Ваш баланс недостаточен для продления ключа. Пожалуйста, пополните баланс.", reply_markup=replenish_keyboard, state=None, message_key='insufficient_funds_message_id') + finally: + await state.clear() + await callback_query.answer() diff --git a/key_management.py b/key_management.py index 6fe46dd0..0417b7de 100644 --- a/key_management.py +++ b/key_management.py @@ -19,8 +19,6 @@ from database import (add_connection, get_balance, has_active_key, store_key, update_balance) from handlers.profile import process_callback_view_profile from handlers.start import start_command -from aiogram.types import ReplyKeyboardMarkup, KeyboardButton - router = Router() @@ -89,12 +87,6 @@ async def cancel_create_key(callback_query: CallbackQuery, state: FSMContext): await process_callback_view_profile(callback_query, state) await callback_query.answer() -def start_keyboard(): - keyboard = ReplyKeyboardMarkup(resize_keyboard=True) - start_button = KeyboardButton(text='/start') - keyboard.add(start_button) - return keyboard - # Обработка текстовых сообщений @dp.message() async def handle_text(message: Message, state: FSMContext): @@ -114,16 +106,10 @@ async def handle_text(message: Message, state: FSMContext): if message.text in ["/start", "Меню"]: await start_command(message) return - - if message.text.lower() == "карина кринж": - await message.answer("Это и так всем понятно, но лучше займемся доступом к впн. Кстати, с днем рождения!") - return - + if current_state == Form.waiting_for_key_name.state: await handle_key_name_input(message, state) - await message.answer("Выберите действие:", reply_markup=start_keyboard()) - async def handle_key_name_input(message: Message, state: FSMContext): tg_id = message.from_user.id @@ -258,27 +244,4 @@ async def renew_expired_keys(): ]) await bot.send_message(tg_id, "Ваш баланс недостаточен для продления ключа. Пожалуйста, пополните баланс.", reply_markup=replenish_keyboard) - await asyncio.sleep(3600) - - -async def notify_expiring_keys(): - while True: - current_time = datetime.utcnow() - threshold_time = int((current_time + timedelta(hours=10)).timestamp() * 1000) - - conn = await asyncpg.connect(DATABASE_URL) - try: - # Получаем пользователей с истекающими ключами - expiring_keys = await conn.fetch('SELECT tg_id, expiry_time FROM keys WHERE expiry_time <= $1', threshold_time) - - for record in expiring_keys: - tg_id = record['tg_id'] - expiry_time = record['expiry_time'] - - # Отправляем уведомление пользователю - await bot.send_message(tg_id, f"🔔 Ваш ключ истекает через 10 часов. Пожалуйста, продлите его, чтобы избежать отключения.") - - finally: - await conn.close() - - await asyncio.sleep(3600) # Проверяем каждый час \ No newline at end of file + await asyncio.sleep(3600) \ No newline at end of file diff --git a/main.py b/main.py index b639e650..5bc5a1d3 100644 --- a/main.py +++ b/main.py @@ -2,12 +2,10 @@ import asyncio from bot import bot, dp, router from database import init_db -from key_management import notify_expiring_keys async def main(): await init_db() - asyncio.create_task(notify_expiring_keys()) dp.include_router(router) # Подключение роутера await dp.start_polling(bot) # Запуск поллинга