From c0ef791f01f601d278f1c4ca3380d6b7716ca9e1 Mon Sep 17 00:00:00 2001
From: MMR <56675802+mmrabbani@users.noreply.github.com>
Date: Wed, 18 Oct 2023 12:25:16 +0330
Subject: [PATCH] increase accuracy of geoip and geosite (#1047)

* increase accuracy of geoip and geosite

* Update x-ui.sh

* Update release.yml

* Update settings.html

* Update release.yml

* Update DockerInit.sh

* Update settings.html

* Update settings.html

* Update x-ui.sh
---
 .github/workflows/release.yml | 2 ++
 DockerInit.sh                 | 6 ++++--
 web/html/xui/settings.html    | 5 +++--
 x-ui.sh                       | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a86cfa81..7eb93dec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,6 +58,8 @@ jobs:
           rm -f geoip.dat geosite.dat iran.dat
           wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
           wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+          wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
+          wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
           wget https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat
           mv xray xray-linux-${{ matrix.platform }}
           cd ../..
diff --git a/DockerInit.sh b/DockerInit.sh
index 1c236ee5..3cc31a3d 100755
--- a/DockerInit.sh
+++ b/DockerInit.sh
@@ -23,6 +23,8 @@ unzip "Xray-linux-${ARCH}.zip"
 rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat
 mv xray "xray-linux-${FNAME}"
 
-wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat"
-wget "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat"
+wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
+wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
 wget "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat"
diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index 39a24c10..47e3405d 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -472,13 +472,14 @@
                 ips: {
                     local: ["geoip:private"],
                     cn: ["geoip:cn"],
-                    ir: ["geoip:ir"],
+                    ir: ["geoip:ir","ext:geoip_ch.dat:arvancloud","ext:geoip_ch.dat:derakcloud","ext:geoip_ch.dat:iranserver"],
                     ru: ["geoip:ru"],
                 },
                 domains: {
                     ads: [
                         "geosite:category-ads-all",
-                        "ext:iran.dat:ads"
+                        "ext:iran.dat:ads",
+                        "ext:geosite_ch.dat:ads"
                     ],
                     speedtest: ["geosite:speedtest"],
                     openai: ["geosite:openai"],
diff --git a/x-ui.sh b/x-ui.sh
index d193c642..58351c78 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -522,6 +522,8 @@ update_geo() {
     rm -f geoip.dat geosite.dat iran.dat
     wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
     wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
+    wget -O geoip_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat
+    wget -O geosite_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat
     wget -N https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat
     systemctl start x-ui
     echo -e "${green}Geosite.dat + Geoip.dat + Iran.dat have been updated successfully in bin folder '${binfolder}'!${plain}"