From 958a8fb74cf79686be1759b518874198bf75f303 Mon Sep 17 00:00:00 2001
From: Vlad <curov2014@yandex.ru>
Date: Sat, 28 Sep 2024 13:12:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B8?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handlers/__pycache__/keys.cpython-310.pyc     | Bin 10364 -> 10254 bytes
 .../__pycache__/notifications.cpython-310.pyc | Bin 2439 -> 2911 bytes
 handlers/keys.py                              |  13 +++----
 handlers/notifications.py                     |  32 ++++++++++++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/handlers/__pycache__/keys.cpython-310.pyc b/handlers/__pycache__/keys.cpython-310.pyc
index bcefdc3ae887440f573fb6fc0e614456e8bf1b5f..49d6cd33d2c3ca17108e78fe44678305e0371798 100644
GIT binary patch
delta 604
zcmZvZPiqrF7{=dsb~oMbzic=E>?X!_Lo6*6`T>geBGg-<f_Q&vU<*;=2pVRokfUxd
zb8HJ)=%LqA{S;or4`A^s-U~&clTD*NWNy#==AGwxX8!CP?s%_U*8;VUzg_K}Jw5j}
zB1HKlirFV7U;Cj<qiAjTmmA{}U&!$p5Ntzg41Wn@Y?2|goZaq~L}_p>zeXzuyIdEG
z+z~o0W;k|pAhQY$7-4GlUB%4#Ofa(c*<g?CK9ZB#+!HvOIXc1-_C5?wc{%aPC6CG(
zOWi{Gv{WchsU_iV^iX&`>@f;5Ov^k-DpV0DAgLxbQKo99Pa`9|09B(dzdT$&_|2Q@
zjBUf{wh&HOi)zABCAHZE)m1G$gd?EFiIxU)0!+N|zqbhHd-t0~vU^jymDFfC`)8xx
zX%ah}joxL`&^gQ^_06J09yg**gtUS%tQXTwQ8|JWcIOWH(~9MF>|;yXoz;tvo%gsf
z;Oh6^HsxCTzU*}0$<N)k3?D4Z@7>E)M1VKX6=xqz7NdiV`N%LpotbE&kEYgQq2_Dy
S$D<)WzIeIPMxz^`vv~s*osW$G

delta 706
zcmah{&ubGw6n<~AiEH*pHoIwR(l$(E8|k5<S3y+hp&o>Sg5JCgMpB3+t_Q;`t;s<_
zQ-X64EP(|50~%^YTB}Dd9%lXm(W^%hJ$P_;ON>InIlb?FkN17=z1dv(wPN3~tTaUL
z(vMpomxlHkibPzXW%81UHK!;7O7mT8>VC4H@{bMhGB8+%AldvbhBT*jv5^uV=&ALa
zzFD)_agH2nb}hrwoy1`&!gb)uzB7O^W^fgJjq84vYs~0i-yHzcb1(^Q4APu1bCon2
z%&H@^1H<<?wnxGyH@UG2jcq?yn_wB{uxy6})=~^z=EcwsQJz~><aQOSgylLIWMYF8
zBZEA{@*Qn#DY7Vfvy1CL{i(3VFrZCFY{*TsNuK73!JnbniO{-Mge_o&ULtUh(2uln
ztj*n{wd+%{v*ICp@!#Fmt(c4~{dcc*Jsv`N-rP(V?=K?+9zru8cbMkh7WBwpeZ=Q<
zIa?Z^B|6H&jQCbwxOVSK_#xy|xvd^ixhMD4rg}(KTfUaNRK8IUR7>v4y)dNmAWFTJ
z?;=jMs2r-ts->P#`Ce^=*;jHuEIl~g@OKI)Ig00V&%_J6AkNO0#O?V{iv$7g-U!vm
rhEB?8qDCAf=wgcKsH1~ADH4LY+2R)m#ag9_=XbtVN|>y;XrB8Gzh%TA

diff --git a/handlers/__pycache__/notifications.cpython-310.pyc b/handlers/__pycache__/notifications.cpython-310.pyc
index 09464cdf22c296c482366877bf9855a2f860548a..b0a30e754e84f05b2b974a072b0664731d2a949b 100644
GIT binary patch
delta 1038
zcmb7CO-vI(6n<~^r@QU$wiGO-7Tu^-swf~KF{FqZqjC@vIS??008_9AP|Fgu*_EFf
z@j{eLj0Zx}dNn4ZF?uk1@ZxcM@xVn-MiVa{jPZav%TF){O`OTRH+k>--uve5&Xm84
z7?*V24}2Ya`)%MyaL$O6Z8%r^aIWs`PGcxAtaWP$X(<ogl{A<Z2M7((vKwM|6~zun
zh8I6Sz#~b_dL^<dH~r`pTU$Zyz07NVM&krv3Ugm9D4<1(*aj3%frGjC%q6Wjz(PW7
z!uC;ND_BB7EJ8spLKGauQmA67wnEhy<dOQLkSC7HG5%F_5eoqtD5B%HG)t!%)oqa)
zRWJ_=ga&8HAo3_zy-74o%U2PD0<D-uXCgqi*z!Ekh^=y4Y5Td2F8CbHhKq(R*&3~~
z12i@(uBu14ve(9fk8a(NOoa+4lC{_AwtgJWw>TniE>(deaW8W(Z!UG>KeVn(jV}oQ
zkaxcmxWHf$)&+O+v3L9t8wU}r&>g&XQb%wMgq&fO(Q4c9Mwmy0PUzw^$GC2I<kj0a
zjze-=`zP-MCvi!-aA_<%n)xUI<mOmZ-o<W-dZ5<qAIhXhtey;IDY=oo5nIk>y<a2~
zG5|htFyzV-UHcQm`xDemoN7*-ZccQJ#dy5IbYHknOH-xWrJH6=Lw&tjnk?nr#RJKl
zo=uOW$9pah^^VvL_L92M<BU{UKNjcg#^2cPBeUjU(_i?FHj7G!*r2qpZ3pM2>iQ0w
z?sMLDnm3=}XWCqGlkQXZnVIT4JXXPBUhGk6%6;iRUSZUDiKaDvlHHT**#{|%+n;=w
z$`HdW;7h5(aPQS6Av0pJ6TWr~vb(-iM71)*>7JqVfVJdb8Q{vDxxOyhd&THkR;R>|
z2@$Lygxd&es4Pe27|Mbn_?Hz)K?Mm}&uBbDzV0$Y7)NE2{LHrUBFR{G51Ue6VJkbT
X?#5bnL9GreLWtK2@vZSKlQ8)OF-8w3

delta 640
zcmaJ;&uddb5T4ohYv0fOYAdZ#a_CbcEh>sMAyz6X?ID8X5G#mK#})(;<C9?6XKfXG
z%Au~e8pu27MS3cN2f>3N9-EUF!9PIHdXl;!(TmW5*>Cw~zxjrpZ(|#|;I8jGpdwZM
zwS3Xr4D#$fY))<Gf?N7BqZFl|>et2zYf#MWT*fz8YS`-aP3&ui;VbO-_^9&!b5&Wx
z)^-G4j97vTKrjz6wqDATc5Zbh)`d>SIK+lRQ=zHQQfNh5mkW!ugOFg?CZ1r-BPVjn
zCWqWMTfr41uZ^)yzA(3d0>Rap>KL&j;I=0W;ZR!Glxgb&SA=`V1a>XTs@{46U2`=7
z(ncU*!?9f9UV!UI{~u~!<6KAE$1<veGW8SqJ49W5L2baz{Ue*8Llivxj1YSWtsqL#
zi14<c!=4~Q9Tt@+_8xhC>EPDHCKN~IoH2^eWZgI^zgVZ_C*y3cl?fN8!#mR<6~g&)
zSS^P&`O2J;H_S2l)ts6<p!QNZzBF6deb-y-t?$0=ZKzx?RF-BRoF3NX73(}6-g#kV
z5YzHCugD*~ioPt{71_40n%VwtFUjwA{tPnBL%x^QC(zUa&H2p@j(o^^ie*11{Q&dG
eAG5tiNePP+jZiK)AFw2C_Xy_Y3HK1oYJUKRv6AZm

diff --git a/handlers/keys.py b/handlers/keys.py
index b244c00d..3c5d0b0f 100644
--- a/handlers/keys.py
+++ b/handlers/keys.py
@@ -254,7 +254,6 @@ async def process_callback_confirm_delete(callback_query: types.CallbackQuery):
 
     await callback_query.answer()
 
-# Обработка выбора плана продления
 @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
@@ -271,13 +270,15 @@ async def process_callback_renew_plan(callback_query: types.CallbackQuery):
                 expiry_time = record['expiry_time']
                 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(current_time + timedelta(days=days_to_extend).total_seconds() * 1000)
+                else:
+                    # Ключ активен, продлеваем от текущей даты истечения
+                    new_expiry_time = int(expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000)
 
-                # Рассчитываем новую дату истечения
-                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)
diff --git a/handlers/notifications.py b/handlers/notifications.py
index b8df99b2..52dbaf86 100644
--- a/handlers/notifications.py
+++ b/handlers/notifications.py
@@ -15,6 +15,16 @@ router = Router()
 class NotificationStates(StatesGroup):
     waiting_for_notification_text = State()
 
+import asyncpg
+from datetime import datetime, timedelta
+from aiogram import Bot
+from aiogram import Router, types
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from bot import bot
+from config import DATABASE_URL
+
+router = Router()
+
 async def notify_expiring_keys(bot: Bot):
     try:
         conn = await asyncpg.connect(DATABASE_URL)
@@ -22,7 +32,7 @@ async def notify_expiring_keys(bot: Bot):
             # Получаем все ключи, которые истекают в течение следующих 10 часов
             threshold_time = (datetime.utcnow() + timedelta(hours=10)).timestamp() * 1000  # В миллисекундах
             records = await conn.fetch('''
-                SELECT tg_id, email, expiry_time FROM keys 
+                SELECT tg_id, email, expiry_time, client_id FROM keys 
                 WHERE expiry_time <= $1 AND expiry_time > $2
             ''', threshold_time, datetime.utcnow().timestamp() * 1000)
 
@@ -30,17 +40,24 @@ async def notify_expiring_keys(bot: Bot):
                 tg_id = record['tg_id']
                 email = record['email']
                 expiry_time = record['expiry_time']
+
+                # Рассчитываем оставшееся время и уменьшаем его на 3 часа
+                time_left = (expiry_time / 1000) - datetime.utcnow().timestamp()
+                hours_left = max(0, int(time_left // 3600) - 3)
+
                 expiry_date = datetime.utcfromtimestamp(expiry_time / 1000).strftime('%Y-%m-%d %H:%M:%S')
-                
-                # Создаем клавиатуру с кнопкой "Пополнить баланс"
+
+                # Создаем клавиатуру с выбором тарифов
                 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='Пополнить баланс', callback_data='replenish_balance')]
                 ])
 
-                message = f"Ваш ключ <b>{email}</b> истечет <b>{expiry_date}</b>. Пожалуйста, продлите его."
+                message = f"Ваш ключ <b>{email}</b> истечет через <b>{hours_left} часов</b> (<b>{expiry_date}</b>). Пожалуйста, продлите его."
                 await bot.send_message(chat_id=tg_id, text=message, parse_mode='HTML', reply_markup=keyboard)
 
-            # Получаем все истекшие ключи
+            # Обрабатываем истекшие ключи
             expired_records = await conn.fetch('''
                 SELECT tg_id, email FROM keys 
                 WHERE expiry_time <= $1
@@ -49,9 +66,10 @@ async def notify_expiring_keys(bot: Bot):
             for record in expired_records:
                 tg_id = record['tg_id']
                 email = record['email']
-                
-                # Создаем клавиатуру с кнопкой "Пополнить баланс"
+
                 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='Пополнить баланс', callback_data='replenish_balance')]
                 ])