From 4e8f5e71a787bb219c56c95634bb044dd0878d9a Mon Sep 17 00:00:00 2001 From: Vlad Date: Mon, 23 Sep 2024 16:48:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/__pycache__/keys.cpython-310.pyc | Bin 9019 -> 9121 bytes handlers/keys.py | 12 +++++++++++- key_management.py | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/handlers/__pycache__/keys.cpython-310.pyc b/handlers/__pycache__/keys.cpython-310.pyc index 9a69ce573cffec6e192a71f37457c840e8cfede1..0ccaa853fc7414eef06dfe9e94f8e936a898d31a 100644 GIT binary patch delta 962 zcmZvaO-vI(6vy{%KWw`nv}Ko;t&o-|P`MD|SE3;v{AeW+lnQb{tWK$|Qp&PKC0oIG z?&%p4Lr7Y~(Tn!r!J~=ZIB@VlV$yIhCSLSFVvLE-D_}` z(!UCXb^0m-4Kc#Ih*93#kt>$N`336SIaCRLRyRP-Gm^K~2vbhf^+oE4Ylu0m2^ zLP97x7T57fK!?}3t@kYDEh#UvL(F4~tHPSdyk)WEX=pwsHD+EuQ*2KbY;P8_B9qHd z@>y!Wg()`JLf)Sb*gmF~oxAx#7#D0uC0G@jb0&-ml%0@E!|MYG+^9TBQf(OFv+xEfk>m1Ht$%Lhz`S$o;lw8d=( z4)`p1$T!y8^fRA9C@CN;wl(@RY=zEdKM{+R9nB;Y{8UTIW2NBQePe$p1cxyZN=3{o z^nZp45yA+eo6w2RLt_xdZ=r;^Fo0=E$5i+vJ`1n7uhRN8>~BAD-pugtc-ZVAsh8j< z{Pz;jf=C$W*z#JrnasSEo+;vx7B>`H7$Zy&1_;MF;wmm_o#-+&?=8{>IWTM__|;1r z5ls_S(7-8*AcC6@`IqR%Wg`xA{H`6r4Wk=2Ydgla7|T<1h>#>)Cfp-5Iso%V?MKH? zh?DazN3LM~bBAf~U;AbOBhi~Mjf>G_$1KIP6fzH{G7pP6^U)Nww&lDtJ8zjqtVg3# zmV)mR&SFdr<4b=~GBXrWyq_*?;<;EFmhnaG0%Y(@Y!H0d)3vUrDS#1jggL@8*1N`B J13{2a{Q*Nh;m`m8 delta 867 zcmZva%WD%+6vpqFJUYo_(wQXFOcN+cingh?l!Azxy3y8Dh<({Er0?6thBhhFDPo!Q zfg3kj9VtktBp{+o$3l>$? z&&1WM{#tl(?QQU*0&DnLX%{?HcDzGkY3(j*iDvxa3DrLYz5+~Pw{Z!wsOZW1&)@{W zFlMw0%pS?pbwyWP#;|zKN)tK=0m4ZAO2iG26TXQcDfHs^qE=typxzR$*zT&w_SPW7 zIJ?72uJxz5tsAg|2S(dw)>iTX-r#`4@@hWF<+AJ82W*@1gPvqf}Ip z|8!$6<3y-ckDg6T^QKMQijLy%=!kbteAKmWoKXy%HoF?EIQ2azy&K<{Jq^}np;;~X z#eA;ZquW99bc&NU@maHZGi_RJB)1bZ!hesH79_%bfqkF7xIDjV&n&OtVRJ0zp@lBO zRf0+wC5+=rq!Wi?5iG{~6SssUZOM`b5*38NEy*B*2C@_rJ${d+p@>?10QTw+;s;Xl zA#D;RWC#O}wtKw1*&Y{VyTSz}f%+ diff --git a/handlers/keys.py b/handlers/keys.py index 424da168..d7029ace 100644 --- a/handlers/keys.py +++ b/handlers/keys.py @@ -172,7 +172,17 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery): 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) + # Кнопка для удаления ключа и возврата в профиль + 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 keyboard = types.InlineKeyboardMarkup(inline_keyboard=[ diff --git a/key_management.py b/key_management.py index 44feb0bf..9d1da1b6 100644 --- a/key_management.py +++ b/key_management.py @@ -106,7 +106,11 @@ 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)