From 82db60911904f97098703bc921539bcc227a66ff Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 2 Oct 2024 02:06:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BA=D1=88=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D1=8F=D1=8E=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.py | 5 ----- handlers/notifications.py | 22 +++++++++++++++++----- handlers/solo_pic.png | Bin 1740 -> 0 bytes 3 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 handlers/solo_pic.png diff --git a/bot.py b/bot.py index 0e93fb3b..0c12b0f8 100644 --- a/bot.py +++ b/bot.py @@ -19,8 +19,3 @@ dp.include_router(keys.router) dp.include_router(key_management.router) dp.include_router(pay.router) dp.include_router(notifications.router) - - - -async def on_startup(dispatcher: Dispatcher): - await login_with_credentials() diff --git a/handlers/notifications.py b/handlers/notifications.py index 31dc7bf0..510886f4 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -7,7 +7,9 @@ from aiogram.types import ( # Импортируем необходимые к InlineKeyboardButton, InlineKeyboardMarkup) from bot import bot -from config import DATABASE_URL +from config import DATABASE_URL, ADMIN_PASSWORD, ADMIN_USERNAME +from client import delete_client +from auth import login_with_credentials router = Router() @@ -48,21 +50,31 @@ async def notify_expiring_keys(bot: Bot): # Обрабатываем истекшие ключи expired_records = await conn.fetch(''' - SELECT tg_id, email FROM keys + SELECT tg_id, email, client_id FROM keys WHERE expiry_time <= $1 ''', datetime.utcnow().timestamp() * 1000) for record in expired_records: tg_id = record['tg_id'] email = record['email'] + client_id = record['client_id'] + + # Удаляем ключ из базы данных + await conn.execute('DELETE FROM keys WHERE client_id = $1', client_id) + + # Создаем сессию с использованием учетных данных + session = login_with_credentials(ADMIN_USERNAME, ADMIN_PASSWORD) + + # Удаляем клиента из панели + delete_client(session, client_id) keyboard = InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text='1 месяц (100 руб.)', callback_data=f'renew_plan|1|{record["client_id"]}')], - [InlineKeyboardButton(text='3 месяца (250 руб.)', callback_data=f'renew_plan|3|{record["client_id"]}')], + [InlineKeyboardButton(text='1 месяц (100 руб.)', callback_data=f'renew_plan|1|{client_id}')], + [InlineKeyboardButton(text='3 месяца (250 руб.)', callback_data=f'renew_plan|3|{client_id}')], [InlineKeyboardButton(text='Пополнить баланс', callback_data='replenish_balance')] ]) - message = f"Ваш ключ {email} уже истек. Пожалуйста, продлите его." + message = f"Ваш ключ {email} уже истек и был удален. Пожалуйста, продлите его." await bot.send_message(chat_id=tg_id, text=message, parse_mode='HTML', reply_markup=keyboard) finally: diff --git a/handlers/solo_pic.png b/handlers/solo_pic.png deleted file mode 100644 index 484f1bdc73ce9f94c7158e394f5080da08e70381..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1740 zcmbVNYd8}M7@kCOzm)4}QmNcFcEV6D&81U@h{~Dz{W}iW72( z6B9xXGS|7ar5yK>*kNNF=kNJ>zUO(r_j$kP`}O{K-!u<*7X?{uSpWc_;O2VKYoELJ zVIw2Gzx#cPpY78@vZI@~%>LY#2~XYETG4R7=&J;DbZiI-1;F45Q798~7zu^Kld**8 zRmqm~`%k7gZ@*|K5-KDbN5F%;aZ#xKBLKiIW!HerA)o;|yN=xqG6$POL0}6Q!~zDk zw$=ae5CD)q;dar%`&J?UQxNt#NB7XTs`NY{U2f0=WI3ZRtGk>cn!c-jR!XCCy4BnN z*I=ar4r64&32pxEca}FQ@iD5pgZA((<8!3PtZn#MqP#HVVbS#ELD!z6&m5@Vn9@=a zpOv+MOjR8gt@`R-D`TSIlU4VoBy~VoRFe5#Oj^xKI&!OegZUF3kg2E82DCe%f>c|U zJ*aH%LY#5^hO2_lcr3uE&|ia7mqGT~2%5@qh9_qzF#bbG88OxGH1N2(EF(3!O+U2s zf65Mt^QdP50BxxEQnC@E$GidS{=hXTv*;6 zl6L9vX>Ho05r-E65~4xZ*zE_b@hRACo(t-H!c4^qSKYu&aiw-t-~j6kdo|2$48BR1 z%PTGNd5F;bV^w3bo_Vyyx}Uv0E^o-vDW#ALJ`LC2Bp;b$ z>2{^L%9Q52f4(d#e<0eN!16g56-vZ`KE{w$tZ}?OC|+&V{i!4c&);su-b`t{!vLh> z8Tg<_P6m`rgzvcjc)%EXEi^kT=gjP@qeyYn$HnO4g|8_!Sz6~CiE9^#IO=-kZqWK- z(-daD$=6SZpkZ|+15Ex+07vXu;yS73y$E5YS^e0{qYtiVIu{3Inr!zP%7@L#1^7kQ z)QyGy=O6^tE}VwmybsB|GHl?-*A1@+)EwGfp|1s_QJNH5p-Fb3F1pgDqo!Z!i&S>| ze1%XMJP#5yLql87RZmE;?fHRnSp;fo)S1X9q^dNwk!h#{AXoKl1^2nQb7f9gWc8(a zIz!bgd81nzy?4#AF~H%&Jp;XfC1fKffy|0ObWf?Cn>Tq2{6i8re&WI<>>UI8%$g)E zcZNCMMTC0(fvm-QM8vfuJ6mOJyql1il!zbsm?v@<8U&cwZ0*|MGy!#S*VyS)A_D(% zyrXHh90h%%r)owxD|;$y@&4n#^F1&BGD%cB96A1l7u5FLvbG-SxR9gmSoMB-k*6I9 z-2Pe7zc~0*toZ~2q@)IAQL9j4)x4!2X}jcq+E-D3Tyb_EjKj%oHptx+=< zuBuQCEN+t^-aGG3ww;;9R8;az1_{5%LaO?@V~;}#i0ZniH2w<*=LAp!1U+|dWz&ob zJ=NJ;=B6GIGrFpd+_LI#r5npdeedRWZJ?12*D-b8;W0EaWo0?Y>Y9J0`+bYec4&?r z1Qy~nq+2?a6OIl~x5$Xn8UHy~O~Whte$_|^)uMNo%cI(JI<3c+*asC140C$>_@UfO zSx638Siyg*`f4@AKIxEkV-tlhXB?m%{$~s};c;5$yn?(rt!xX+-#sB~S