From a3ab8a51ccb6be8808e9750df8a0334cf37307cd Mon Sep 17 00:00:00 2001
From: DaTekShaman <datekshaman@yandex.ru>
Date: Mon, 13 Oct 2025 13:29:13 +0300
Subject: [PATCH] Updated logic

---
 config/warpgate.yaml | 211 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 197 insertions(+), 14 deletions(-)

diff --git a/config/warpgate.yaml b/config/warpgate.yaml
index 2b70be6..f839646 100644
--- a/config/warpgate.yaml
+++ b/config/warpgate.yaml
@@ -616,6 +616,8 @@ proxy-groups:
   - name: Adblock 🇷🇺
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
       - REJECT-DROP
       - Non-personal 1️⃣
       - Non-personal 2️⃣
@@ -625,6 +627,8 @@ proxy-groups:
   - name: Adblock 🗺️
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
       - REJECT-DROP
       - Non-personal 1️⃣
       - Non-personal 2️⃣
@@ -634,7 +638,9 @@ proxy-groups:
   - name: Antifilter
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -653,7 +659,9 @@ proxy-groups:
   - name: Antifilter Extended
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -672,6 +680,10 @@ proxy-groups:
 # —————————————————————— PRIVATE LISTS —————————————————————— #
   - name: Adaptation
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -689,6 +701,14 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: Persistent Proxy
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
+      - Route Alpha
+      - Route Bravo
+      - Route Charlie
+      - Route Delta
       - Personal 1️⃣
       - Personal 2️⃣
       - Non-personal 1️⃣
@@ -700,6 +720,10 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: Testzone 🅰
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -715,6 +739,10 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: Testzone 🅱
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -733,6 +761,13 @@ proxy-groups:
     disable-udp: false
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
+      - Route Alpha
+      - Route Bravo
+      - Route Charlie
+      - Route Delta
       - Personal 1️⃣
       - Personal 2️⃣
       - Non-personal 1️⃣
@@ -746,6 +781,9 @@ proxy-groups:
     disable-udp: false
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -762,6 +800,9 @@ proxy-groups:
     disable-udp: false
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -779,6 +820,9 @@ proxy-groups:
     disable-udp: false
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -794,6 +838,10 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: AI Stuff
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -818,10 +866,9 @@ proxy-groups:
   - name: RU Intracountry VPN
     proxies:
       - DIRECT
-      - Route Alpha
-      - Route Bravo
-      - Route Charlie
-      - Route Delta
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Russia 🇷🇺
       - Russia 🇷🇺 🄪
     <<: [*group_selector, *health_check_for_groups]
@@ -829,6 +876,9 @@ proxy-groups:
     disable-udp: false
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -837,6 +887,9 @@ proxy-groups:
   - name: Hentai
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -845,6 +898,9 @@ proxy-groups:
   - name: Games
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -853,6 +909,9 @@ proxy-groups:
   - name: Libraries
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -861,6 +920,9 @@ proxy-groups:
   - name: News
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -869,6 +931,9 @@ proxy-groups:
   - name: Porn
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -877,6 +942,9 @@ proxy-groups:
   - name: Torrent Trackers
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -887,6 +955,9 @@ proxy-groups:
   - name: Adobe
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -895,6 +966,9 @@ proxy-groups:
   - name: AliExpress
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -903,6 +977,9 @@ proxy-groups:
   - name: Amazon
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -911,6 +988,9 @@ proxy-groups:
   - name: Apple
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -919,6 +999,9 @@ proxy-groups:
   - name: Apple Music
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -927,6 +1010,9 @@ proxy-groups:
   - name: Cloudflare
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -935,6 +1021,9 @@ proxy-groups:
   - name: Cursor
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -944,6 +1033,10 @@ proxy-groups:
     type: select
     disable-udp: false
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -966,6 +1059,9 @@ proxy-groups:
   - name: Dropbox
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -975,7 +1071,9 @@ proxy-groups:
     type: select
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -994,6 +1092,9 @@ proxy-groups:
   - name: Facebook
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1002,6 +1103,9 @@ proxy-groups:
   - name: Figma
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1010,6 +1114,9 @@ proxy-groups:
   - name: Gemini
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1018,6 +1125,9 @@ proxy-groups:
   - name: GitHub
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1026,6 +1136,9 @@ proxy-groups:
   - name: Google
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1034,6 +1147,9 @@ proxy-groups:
   - name: Instagram
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1042,6 +1158,9 @@ proxy-groups:
   - name: Microsoft
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1050,6 +1169,9 @@ proxy-groups:
   - name: Netflix
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1058,6 +1180,9 @@ proxy-groups:
   - name: Nintendo
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1065,6 +1190,10 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: Notion
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1079,6 +1208,9 @@ proxy-groups:
   - name: Onedrive
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1087,6 +1219,9 @@ proxy-groups:
   - name: OpenAI
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1095,6 +1230,9 @@ proxy-groups:
   - name: Perplexity
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1103,6 +1241,9 @@ proxy-groups:
   - name: Playstation Network
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1110,6 +1251,10 @@ proxy-groups:
     <<: [*group_selector, *health_check_for_groups]
   - name: Proton
     proxies:
+      - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1124,6 +1269,9 @@ proxy-groups:
   - name: Signal
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1132,6 +1280,9 @@ proxy-groups:
   - name: Soundcloud
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1140,6 +1291,9 @@ proxy-groups:
   - name: Spotify
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1148,7 +1302,9 @@ proxy-groups:
   - name: Steam
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1167,7 +1323,9 @@ proxy-groups:
   - name: Telegram
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1187,6 +1345,9 @@ proxy-groups:
   - name: TikTok
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1195,6 +1356,9 @@ proxy-groups:
   - name: Twitter/X
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1203,6 +1367,9 @@ proxy-groups:
   - name: Ubiquity
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1211,6 +1378,9 @@ proxy-groups:
   - name: Ubisoft
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1219,6 +1389,9 @@ proxy-groups:
   - name: VSCode & Copilot
     proxies:
       - DIRECT
+      - PASS
+      - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1227,7 +1400,9 @@ proxy-groups:
   - name: WeChat
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1249,7 +1424,9 @@ proxy-groups:
   - name: WhatsApp
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1269,7 +1446,9 @@ proxy-groups:
   - name: XBox
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1288,7 +1467,9 @@ proxy-groups:
   - name: YouTube
     proxies:
       - DIRECT
+      - PASS
       - REJECT
+      - REJECT-DROP
       - Route Alpha
       - Route Bravo
       - Route Charlie
@@ -1602,6 +1783,18 @@ rules:
 - RULE-SET,📃 General Direct Domain List,DIRECT
 - RULE-SET,📃 General Direct IP List,DIRECT
 
+# ————————————————————— by device type —————————————————————— #
+- RULE-SET,🛜 Local Devices,Local Devices
+- RULE-SET,🛜 Infrastructure,Infrastructure
+- RULE-SET,🛜 IOT Clients,IOT Clients
+- RULE-SET,🛜 Webway,Webway
+
+# ———————————————————— by global service ———————————————————— #
+- RULE-SET,Meta,Meta
+- RULE-SET,Cloudflare,Cloudflare
+- RULE-SET,Microsoft,Microsoft
+- RULE-SET,Google,Google
+
 # ———————————————————————— by service ——————————————————————— #
 - RULE-SET,Adobe,Adobe
 - RULE-SET,AliExpress,AliExpress
@@ -1652,12 +1845,6 @@ rules:
 - RULE-SET,📦 Porn,Porn
 - RULE-SET,📦 Torrent Trackers,Torrent Trackers
 
-# ———————————————————— by global service ———————————————————— #
-# - RULE-SET,Meta,Meta
-- RULE-SET,Cloudflare,Cloudflare
-- RULE-SET,Microsoft,Microsoft
-- RULE-SET,Google,Google
-
 # ————————————————————— by private lists ———————————————————— #
 - RULE-SET,🛝 Testzone A,Testzone 🅰
 - RULE-SET,🛝 Testzone B,Testzone 🅱 
@@ -1688,10 +1875,6 @@ rules:
 # - GEOIP,CN,CN Services
 
 # ——————————————————————— final match ——————————————————————— #
-- RULE-SET,🛜 Local Devices,Local Devices
-- RULE-SET,🛜 Infrastructure,Infrastructure
-- RULE-SET,🛜 IOT Clients,IOT Clients
-- RULE-SET,🛜 Webway,Webway
 - MATCH,DIRECT
 
 # Anime, Reddit from News, Yandex, VK, eBay, Samsung, PayPal
\ No newline at end of file