From bc28be571b236ad72db03dbad18a999c9ca13388 Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Wed, 26 Nov 2025 10:22:35 +0400
Subject: [PATCH] fix warp rules for xray

---
 app/bot.php | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/bot.php b/app/bot.php
index ac76959..49ffd60 100644
--- a/app/bot.php
+++ b/app/bot.php
@@ -2921,32 +2921,52 @@ DNS-over-HTTPS with IP:
             ];
         }
         if (!empty($c['warplist']) && !empty(array_filter($c['warplist']))) {
-            $rules[] = [
-                "type"        => "field",
-                "outboundTag" => "warp",
-                "domain"      => array_keys(array_filter($c['warplist'], function ($v, $k){
+            $domains = array_keys(array_filter($c['warplist'], function ($v, $k){
                     if (!empty($v)) {
                         if (!preg_match('~^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$~', $k)) {
                             return true;
                         }
                     }
                     return false;
-                }, ARRAY_FILTER_USE_BOTH)),
-            ];
+                }, ARRAY_FILTER_USE_BOTH));
+                if (!empty($domains)) {
+                    $rules[] = [
+                        "type"        => "field",
+                        "outboundTag" => "warp",
+                        "domain"      => array_keys(array_filter($c['warplist'], function ($v, $k){
+                            if (!empty($v)) {
+                                if (!preg_match('~^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$~', $k)) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        }, ARRAY_FILTER_USE_BOTH)),
+                    ];
+                }
         }
         if (!empty($c['warplist']) && !empty(array_filter($c['warplist']))) {
-            $rules[] = [
-                "type"        => "field",
-                "outboundTag" => "warp",
-                "ip"          => array_keys(array_filter($c['warplist'], function ($v, $k){
+            $ips = array_keys(array_filter($c['warplist'], function ($v, $k){
                     if (!empty($v)) {
                         if (preg_match('~^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$~', $k)) {
                             return true;
                         }
                     }
                     return false;
-                }, ARRAY_FILTER_USE_BOTH)),
-            ];
+                }, ARRAY_FILTER_USE_BOTH));
+                if (!empty($ips)) {
+                    $rules[] = [
+                        "type"        => "field",
+                        "outboundTag" => "warp",
+                        "ip"          => array_keys(array_filter($c['warplist'], function ($v, $k){
+                            if (!empty($v)) {
+                                if (preg_match('~^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(/\d{1,2})?$~', $k)) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        }, ARRAY_FILTER_USE_BOTH)),
+                    ];
+                }
         }
         $xr['routing']['rules'] = $rules ?: [];
         $this->restartXray($xr);