From dc2e1158fad2a01dbbae769680df709f6fcd6185 Mon Sep 17 00:00:00 2001
From: Vladless <curov2014@yandex.ru>
Date: Fri, 16 May 2025 10:06:26 +0300
Subject: [PATCH] ip limit for tariffs

---
 handlers/keys/key_freeze.py | 5 +++--
 handlers/keys/key_renew.py  | 2 +-
 handlers/keys/key_utils.py  | 3 ++-
 panels/three_xui.py         | 7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/handlers/keys/key_freeze.py b/handlers/keys/key_freeze.py
index b4b5a654..eeda21a3 100644
--- a/handlers/keys/key_freeze.py
+++ b/handlers/keys/key_freeze.py
@@ -95,13 +95,13 @@ async def process_callback_unfreeze_subscription_confirm(callback_query: Callbac
             )
             tariff = await session.fetchrow(
                 """
-                SELECT t.traffic_limit
+                SELECT t.*
                 FROM tariffs t
                 JOIN servers s ON s.tariff_group = t.tariff_group
                 WHERE s.server_name = $1
                 ORDER BY t.duration_days DESC
                 LIMIT 1
-            """,
+                """,
                 cluster_id,
             )
 
@@ -118,6 +118,7 @@ async def process_callback_unfreeze_subscription_confirm(callback_query: Callbac
                 client_id=client_id,
                 new_expiry_time=new_expiry_time,
                 total_gb=total_gb,
+                hwid_device_limit=tariff["device_limit"]
             )
             text_ok = SUBSCRIPTION_UNFROZEN_MSG
             builder = InlineKeyboardBuilder()
diff --git a/handlers/keys/key_renew.py b/handlers/keys/key_renew.py
index 8511608b..81789cc5 100644
--- a/handlers/keys/key_renew.py
+++ b/handlers/keys/key_renew.py
@@ -239,7 +239,7 @@ async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_g
         else:
             cluster_id = server_id
 
-        await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb)
+        await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb, hwid_device_limit=tariff["device_limit"])
         await update_key_expiry(client_id, new_expiry_time, conn)
         await update_balance(tg_id, -cost, conn)
 
diff --git a/handlers/keys/key_utils.py b/handlers/keys/key_utils.py
index a0c035fb..578ed73a 100644
--- a/handlers/keys/key_utils.py
+++ b/handlers/keys/key_utils.py
@@ -349,7 +349,8 @@ async def renew_key_in_cluster(
 
                 tasks.append(
                     extend_client_key(
-                        xui, int(inbound_id), unique_email, new_expiry_time, client_id, total_gb, sub_id, tg_id
+                        xui, int(inbound_id), unique_email, new_expiry_time,
+                        client_id, total_gb, sub_id, tg_id, limit_ip=hwid_device_limit
                     )
                 )
 
diff --git a/panels/three_xui.py b/panels/three_xui.py
index 571975c1..a269bae2 100644
--- a/panels/three_xui.py
+++ b/panels/three_xui.py
@@ -70,7 +70,7 @@ async def add_client(xui: py3xui.AsyncApi, config: ClientConfig) -> dict[str, An
         client = py3xui.Client(
             id=config.client_id,
             email=config.email.lower(),
-            limit_ip=config.limit_ip,
+            limit_ip=config.limit_ip if config.limit_ip is not None else 0,
             total_gb=config.total_gb,
             expiry_time=config.expiry_time,
             enable=config.enable,
@@ -106,6 +106,7 @@ async def extend_client_key(
     total_gb: int,
     sub_id: str,
     tg_id: int,
+    limit_ip: int = 0,
 ) -> bool | None:
     try:
         client = await xui.client.get_by_email(email)
@@ -121,7 +122,7 @@ async def extend_client_key(
         client.sub_id = sub_id
         client.total_gb = total_gb
         client.enable = True
-        client.limit_ip
+        client.limit_ip = limit_ip
         client.inbound_id = inbound_id
         client.tg_id = tg_id
 
@@ -212,7 +213,7 @@ async def toggle_client(xui: py3xui.AsyncApi, inbound_id: int, email: str, clien
         client.enable = enable
         client.id = client_id
         client.flow = "xtls-rprx-vision"
-        client.limit_ip
+        client.limit_ip = 0
         client.inbound_id = inbound_id
 
         await xui.client.update(client.id, client)