fix sync, skip frozen subs / improve keys update / fix country switch no tariff / improve unfreeze sub / add back button in admin reset hwid

handlers/admin/clusters/clusters_handler.py

@@ -579,7 +579,7 @@ async def handle_sync_cluster(
                 Key.expiry_time,
                 Key.remnawave_link,
                 Key.tariff_id,
-            ).where(Key.server_id == cluster_name)
+            ).where(Key.server_id == cluster_name, Key.is_frozen.is_(False))
         )
         keys_to_sync = result.mappings().all()
 
@@ -616,7 +616,10 @@ async def handle_sync_cluster(
                     if key["tariff_id"]:
                         tariff = await session.get(Tariff, key["tariff_id"])
                         if tariff:
-                            traffic_limit_bytes = int(tariff.traffic_limit * 1024**3)
+                            if tariff.traffic_limit is not None:
+                                traffic_limit_bytes = int(tariff.traffic_limit * 1024**3)
+                            else:
+                                traffic_limit_bytes = 0
                             hwid_limit = tariff.device_limit
                         else:
                             logger.warning(

handlers/admin/users/users_handler.py

@@ -121,7 +121,10 @@ async def handle_hwid_menu(
             break
 
     if not remna_server:
-        await callback_query.message.edit_text("🚫 Нет доступного сервера Remnawave.")
+        await callback_query.message.edit_text(
+            "🚫 Нет доступного сервера Remnawave.",
+            reply_markup=build_editor_kb(tg_id)
+        )
         return
 
     api = RemnawaveAPI(remna_server["api_url"])
@@ -181,7 +184,10 @@ async def handle_hwid_reset(
             break
 
     if not remna_server:
-        await callback_query.message.edit_text("🚫 Нет доступного сервера Remnawave.")
+        await callback_query.message.edit_text(
+            "🚫 Нет доступного сервера Remnawave.",
+            reply_markup=build_editor_kb(tg_id)
+        )
         return
 
     api = RemnawaveAPI(remna_server["api_url"])