Updates

2025-08-07 17:27:23 +03:00
parent 2ccae6d046
commit 90eb53d528
3 changed files with 150 additions and 83 deletions
--- a/config/dts-pontifex-subrules.yaml
+++ b/config/dts-pontifex-subrules.yaml
@@ -1045,60 +1045,60 @@ rule-providers:
 # ———————————————————————————————————————————————————————— RULES ————————————————————————————————————————————————————————
 sub-rules:
  General Behavior:
-  # ——————————————————————— direct first —————————————————————— #
-  - RULE-SET,General Direct Domain List,DIRECT
-  - RULE-SET,General Direct IP List,DIRECT
+    # ——————————————————————— direct first —————————————————————— #
+    - RULE-SET,General Direct Domain List,DIRECT
+    - RULE-SET,General Direct IP List,DIRECT

-  # ———————————————————————— by service ——————————————————————— #
-  - RULE-SET,Discord,Discord
-  - RULE-SET,Electronic Arts,Electronic Arts
-  - RULE-SET,Notion,Notion
-  - RULE-SET,Proton,Proton
-  - RULE-SET,Steam,Steam
-  - RULE-SET,Telegram,Telegram
-  - RULE-SET,WeChat,WeChat
-  - RULE-SET,WhatsApp,WhatsApp
-  - RULE-SET,XBox,XBox
-  - RULE-SET,Youtube,YouTube
+    # ———————————————————————— by service ——————————————————————— #
+    - RULE-SET,Discord,Discord
+    - RULE-SET,Electronic Arts,Electronic Arts
+    - RULE-SET,Notion,Notion
+    - RULE-SET,Proton,Proton
+    - RULE-SET,Steam,Steam
+    - RULE-SET,Telegram,Telegram
+    - RULE-SET,WeChat,WeChat
+    - RULE-SET,WhatsApp,WhatsApp
+    - RULE-SET,XBox,XBox
+    - RULE-SET,Youtube,YouTube

-  # ————————————————————— by private lists ———————————————————— #
-  - RULE-SET,Testzone A,Testzone 🅰
-  - RULE-SET,Testzone B,Testzone 🅱 
-  - RULE-SET,Persistent Proxy,Persistent Proxy
-  - RULE-SET,General Proxy Domain List,Adaptation
-  - RULE-SET,General Proxy IP List,Adaptation
+    # ————————————————————— by private lists ———————————————————— #
+    - RULE-SET,Testzone A,Testzone 🅰
+    - RULE-SET,Testzone B,Testzone 🅱 
+    - RULE-SET,Persistent Proxy,Persistent Proxy
+    - RULE-SET,General Proxy Domain List,Adaptation
+    - RULE-SET,General Proxy IP List,Adaptation

-  # ———————————————————————— adblocker ———————————————————————— #
-  - RULE-SET,🚫 Adblock List RU,Adblock 🇷🇺
-  - RULE-SET,🚫 Adblock List GL,Adblock 🗺️
+    # ———————————————————————— adblocker ———————————————————————— #
+    - RULE-SET,🚫 Adblock List RU,Adblock 🇷🇺
+    - RULE-SET,🚫 Adblock List GL,Adblock 🗺️

-  # ————————————————————— by service group ———————————————————— #
-  - RULE-SET,AI Stuff,AI Stuff
-  - RULE-SET,RU Intracountry VPN,RU Intracountry VPN
+    # ————————————————————— by service group ———————————————————— #
+    - RULE-SET,AI Stuff,AI Stuff
+    - RULE-SET,RU Intracountry VPN,RU Intracountry VPN

-  # ———————————— by service group (manual country) ———————————— #
-  - RULE-SET,US Services Manual,US Services
-  - RULE-SET,EU Services Manual,EU Services
-  - RULE-SET,CN Services Manual,CN Services
+    # ———————————— by service group (manual country) ———————————— #
+    - RULE-SET,US Services Manual,US Services
+    - RULE-SET,EU Services Manual,EU Services
+    - RULE-SET,CN Services Manual,CN Services

-  # —————————————— force russian geoip to russia —————————————— #
-  - GEOIP,RU,RU Services
+    # —————————————— force russian geoip to russia —————————————— #
+    - GEOIP,RU,RU Services

-  # ————————————————————— community lists ————————————————————— #
-  - RULE-SET,Antifilter Community IP List,Antifilter
-  - RULE-SET,Antifilter Community Domain List,Antifilter
-  - RULE-SET,Antifilter IP List,Antifilter Extended
+    # ————————————————————— community lists ————————————————————— #
+    - RULE-SET,Antifilter Community IP List,Antifilter
+    - RULE-SET,Antifilter Community Domain List,Antifilter
+    - RULE-SET,Antifilter IP List,Antifilter Extended

-  # ———————————————————— force other geoip ———————————————————— #
-  - GEOIP,US,US Services
-  - GEOIP,EU,EU Services
-  - GEOIP,CN,CN Services
+    # ———————————————————— force other geoip ———————————————————— #
+    - GEOIP,US,US Services
+    - GEOIP,EU,EU Services
+    - GEOIP,CN,CN Services

 rules:
  # ——————————————————————— final match ——————————————————————— #
-  - SUB-RULE,Local Devices,General Behavior
-  - SUB-RULE,Infrastructure,General Behavior
-  - SUB-RULE,IOT Clients,General Behavior
-  - SUB-RULE,Webway,General Behavior
+  - SUB-RULE,(RULE-SET,Local Devices),General Behavior
+  - SUB-RULE,(RULE-SET,Infrastructure),General Behavior
+  - SUB-RULE,(RULE-SET,IOT Clients),General Behavior
+  - SUB-RULE,(RULE-SET,Webway),General Behavior
  - MATCH,DIRECT

--- a/config/dts-pontifex.yaml
+++ b/config/dts-pontifex.yaml
@@ -651,31 +651,17 @@ proxy-groups:
      - Non-personal 4️⃣
    <<: *health_check_for_selectors
 # —————————————————— CONSOLIDATED SERVICES —————————————————— #
-  - name: AI Stuff
-    type: select
-    proxies:
-      - ▣ Personal
-      - Personal 1️⃣
-      - Personal 2️⃣
-      - ▣ Non-personal
-      - Non-personal 1️⃣
-      - Non-personal 2️⃣
-      - Non-personal 3️⃣
-      - Non-personal 4️⃣
-      - Europe 🇪🇺
-      - Turkey 🇹🇷
-      - Asia & ME 🇳🇵 
-      - USA 🇺🇸
-      - Europe 🇪🇺 🄪
-      - Turkey 🇹🇷 🄪
-      - Asia & ME 🇳🇵 🄪
-      - USA 🇺🇸 🄪
-    <<: *health_check_for_selectors
-  - name: RU Intracountry VPN
+  - name: RU Services
    type: select
    disable-udp: false
    proxies:
      - DIRECT
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
      - Russia 🇷🇺
      - Russia 🇷🇺 🄪
    <<: *health_check_for_selectors
@@ -692,20 +678,6 @@ proxy-groups:
      - USA 🇺🇸
      - USA 🇺🇸 🄪
    <<: *health_check_for_selectors
-  - name: RU Services
-    type: select
-    disable-udp: false
-    proxies:
-      - DIRECT
-      - Personal 1️⃣
-      - Personal 2️⃣
-      - Non-personal 1️⃣
-      - Non-personal 2️⃣
-      - Non-personal 3️⃣
-      - Non-personal 4️⃣
-      - Russia 🇷🇺
-      - Russia 🇷🇺 🄪
-    <<: *health_check_for_selectors
  - name: CN Services
    type: select
    disable-udp: false
@@ -734,6 +706,35 @@ proxy-groups:
      - Europe 🇪🇺
      - Europe 🇪🇺 🄪
    <<: *health_check_for_selectors
+- name: AI Stuff
+    type: select
+    proxies:
+      - ▣ Personal
+      - Personal 1️⃣
+      - Personal 2️⃣
+      - ▣ Non-personal
+      - Non-personal 1️⃣
+      - Non-personal 2️⃣
+      - Non-personal 3️⃣
+      - Non-personal 4️⃣
+      - Europe 🇪🇺
+      - Turkey 🇹🇷
+      - Asia & ME 🇳🇵 
+      - USA 🇺🇸
+      - Europe 🇪🇺 🄪
+      - Turkey 🇹🇷 🄪
+      - Asia & ME 🇳🇵 🄪
+      - USA 🇺🇸 🄪
+    <<: *health_check_for_selectors
+  - name: RU Intracountry VPN
+    type: select
+    disable-udp: false
+    proxies:
+      - DIRECT
+      - Russia 🇷🇺
+      - Russia 🇷🇺 🄪
+    <<: *health_check_for_selectors
+  
 # ————————————————————————— SERVICES ———————————————————————— #
  - name: Discord
    type: select
@@ -970,10 +971,6 @@ rule-providers:
      
 # ———————————————————————————— consolidated-services ———————————————————————————— #
  # /clash-rules/raw/branch/main/rule-provider/consolidated-services/  
-  AI Stuff:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/ai-stuff-western.yaml
-    path: "./rule_provider/consolidated-services/ai-stuff-western.yaml"                                                                                 
-    <<: *default_rule_provider_config
  RU Intracountry VPN:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/ru-intra.yaml
    path: "./rule_provider/consolidated-services/ru-intra.yaml"                                                                                 
@@ -998,9 +995,45 @@ rule-providers:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/persistent.yaml
    path: "./rule_provider/consolidated-services/persistent.yaml"                                                                                 
    <<: *default_rule_provider_config
+  AI Stuff:
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/ai-stuff-western.yaml
+    path: "./rule_provider/consolidated-services/ai-stuff-western.yaml"                                                                                 
+    <<: *default_rule_provider_config
+  # Hentai:               
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/hentai.yaml                
+  #   path: "./rule_provider/services/hentai.yaml"
+  #   <<: *default_rule_provider_config
+  # News:                 
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/news.yaml                
+  #   path: "./rule_provider/services/news.yaml"
+  #   <<: *default_rule_provider_config
+  # Libraries:                 
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/libraries.yaml                
+  #   path: "./rule_provider/services/libraries.yaml"
+  #   <<: *default_rule_provider_config
+  # Porn:                
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/porn.yaml                
+  #   path: "./rule_provider/services/porn.yaml"
+  #   <<: *default_rule_provider_config
+  # Torrent Trackers:     
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/consolidated-services/torrent-trackers.yaml                
+  #   path: "./rule_provider/services/torrent-trackers.yaml"
+  #   <<: *default_rule_provider_config
  
 # ——————————————————————————————————— services —————————————————————————————————— #
  # /clash-rules/raw/branch/main/rule-provider/services/    
+  # Apple:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/apple.yaml                 
+  #   path: "./rule_provider/services/apple.yaml"
+  #   <<: *default_rule_provider_config
+  # Apple Music:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/apple-music.yaml                
+  #   path: "./rule_provider/services/apple-music.yaml"                                                                                 
+  #   <<: *default_rule_provider_config
+  # Copilot:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/copilot.yaml                
+  #   path: "./rule_provider/services/copilot.yaml"                                                                                 
+  #   <<: *default_rule_provider_config
  Discord:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/discord.yaml                
    path: "./rule_provider/services/discord.yaml"                                                                                 
@@ -1009,6 +1042,26 @@ rule-providers:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/ea.yaml                 
    path: "./rule_provider/services/ea.yaml"
    <<: *default_rule_provider_config
+  # Instagram:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/instagram.yaml                 
+  #   path: "./rule_provider/services/instagram.yaml"
+  #   <<: *default_rule_provider_config
+  # Facebook:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/facebook.yaml                 
+  #   path: "./rule_provider/services/facebook.yaml"
+  #   <<: *default_rule_provider_config
+  # Microsoft:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/microsoft.yaml                 
+  #   path: "./rule_provider/services/microsoft.yaml"
+  #   <<: *default_rule_provider_config
+  # Netflix:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/netflix.yaml                 
+  #   path: "./rule_provider/services/netflix.yaml"
+  #   <<: *default_rule_provider_config
+  # Nintendo:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/nintendo.yaml                 
+  #   path: "./rule_provider/services/nintendo.yaml"
+  #   <<: *default_rule_provider_config
  Notion:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/notion.yaml                 
    path: "./rule_provider/services/notion.yaml"
@@ -1017,6 +1070,14 @@ rule-providers:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/proton.yaml                 
    path: "./rule_provider/services/proton.yaml"
    <<: *default_rule_provider_config
+  # Signal:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/signal.yaml                 
+  #   path: "./rule_provider/services/signal.yaml"
+  #   <<: *default_rule_provider_config
+  # Spotify:
+  #   url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/spotify.yaml                 
+  #   path: "./rule_provider/services/spotify.yaml"
+  #   <<: *default_rule_provider_config
  Steam:
    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/services/steam.yaml                 
    path: "./rule_provider/services/steam.yaml"
@@ -1042,6 +1103,12 @@ rule-providers:
    path: "./rule_provider/services/youtube.yaml"
    <<: *default_rule_provider_config
  
+  
+
+# +трекеры, +порно, +хентай и фанфики, +новости, +copilot, openai, +microsoft, psn, battle.net и активижн добавить в xbox, +nintendo, +signal, adobe, figma, visual studio, cursor, gemini
+# +нетфликс, soundcloud, +apple и +apple music, +spotify, библиотеки, ubiquity, +instagram, +facebook, tik-tok, google, dropbox, twitter, github, perplexity
+# cloudflare, amazon, aliexpress
+
 # ———————————————————————————————————————————————————————— RULES ————————————————————————————————————————————————————————
 rules:

--- a/rule-provider/consolidated-lists-private/local-infrasctructure.yaml
+++ b/rule-provider/consolidated-lists-private/local-infrasctructure.yaml