Fix

Fixed geosite PR

.github/workflows/create-lists.yml

@@ -31,7 +31,7 @@ jobs:
         -v ${{ github.workspace }}/Services:/app/Services \
         -v ${{ github.workspace }}/SRS:/app/SRS \
         -v ${{ github.workspace }}/DAT:/app/DAT \
-        itdoginfo/compilesrs:0.1.5
+        itdoginfo/compilesrs:0.1.8
 
     - name: Check Russia/inside-dnsmasq-ipset
       uses: itdoginfo/dnsmasq-action@0.1
@@ -80,6 +80,6 @@ jobs:
       uses: softprops/action-gh-release@v2.1.0
       with:
         files: |
-          "${{ github.workspace }}/SRS/*.srs"
-          "${{ github.workspace }}/DAT/*.dat"
-        tag_name: ${{ env.TAG_NAME }}
+          ${{ github.workspace }}/SRS/*.srs
+          ${{ github.workspace }}/DAT/*.dat
+        tag_name: ${{ env.TAG_NAME }}

Dockerfile

@@ -2,8 +2,6 @@ FROM ghcr.io/sagernet/sing-box:v1.10.7 AS sing-box
 
 FROM golang:1.22.12-alpine3.21 AS go-builder
 
-WORKDIR /app
-
 RUN CGO_ENABLED=0 GOOS=linux go install -ldflags="-s -w" \
     github.com/v2fly/domain-list-community@20250207120917
 

Subnets/IPv4/telegram.lst

@@ -0,0 +1,9 @@
+91.108.56.0/22
+91.108.4.0/22
+91.108.8.0/22
+91.108.16.0/22
+91.108.12.0/22
+149.154.160.0/20
+91.105.192.0/23
+91.108.20.0/22
+185.76.151.0/24

Subnets/IPv6/telegram.lst

@@ -0,0 +1,5 @@
+2001:b28:f23d::/48
+2001:b28:f23f::/48
+2001:67c:4e8::/48
+2001:b28:f23c::/48
+2a0a:f280::/32

convert.py

@@ -19,6 +19,7 @@ uaDomainsOut='Ukraine/inside'
 DiscordSubnets = 'Subnets/IPv4/discord.lst'
 MetaSubnets = 'Subnets/IPv4/meta.lst'
 TwitterSubnets = 'Subnets/IPv4/twitter.lst'
+TelegramSubnets = 'Subnets/IPv4/telegram.lst'
 
 def raw(src, out):
     domains = set()
@@ -215,8 +216,12 @@ def generate_srs_for_categories(directories, output_json_directory='JSON', compi
     os.makedirs(output_json_directory, exist_ok=True)
     os.makedirs(compiled_output_directory, exist_ok=True)
 
+    exclude = {"meta", "twitter", "discord"}
+
     for directory in directories:
         for filename in os.listdir(directory):
+            if any(keyword in filename for keyword in exclude):
+                continue
             file_path = os.path.join(directory, filename)
             
             if os.path.isfile(file_path):
@@ -266,28 +271,14 @@ def generate_srs_subnets(input_file, output_json_directory='JSON', compiled_outp
             subnet = line.strip()
             if subnet:
                 subnets.append(subnet)
-
-    if input_file == "Subnets/IPv4/discord.lst":
-        data = {
-            "version": 2,
-            "rules": [
-                {
-                    "network": ["udp"],
-                    "ip_cidr": subnets,
-                    "port_range": ["50000:65535"]
-                }
-            ]
-        }
-
-    else:
-        data = {
-            "version": 2,
-            "rules": [
-                {
-                    "ip_cidr": subnets
-                }
-            ]
-        }
+    data = {
+        "version": 2,
+        "rules": [
+            {
+                "ip_cidr": subnets
+            }
+        ]
+    }
 
     filename = os.path.splitext(os.path.basename(input_file))[0]
     output_file_path = os.path.join(output_json_directory, f"{filename}_subnets.json")
@@ -306,6 +297,63 @@ def generate_srs_subnets(input_file, output_json_directory='JSON', compiled_outp
     except subprocess.CalledProcessError as e:
         print(f"Compile error {output_file_path}: {e}")
 
+def generate_srs_combined(input_subnets_file, input_domains_file, output_json_directory='JSON', compiled_output_directory='SRS'):
+    os.makedirs(output_json_directory, exist_ok=True)
+    os.makedirs(compiled_output_directory, exist_ok=True)
+
+    domains = []
+    if os.path.exists(input_domains_file):
+        with open(input_domains_file, 'r', encoding='utf-8') as file:
+            domains = [line.strip() for line in file if line.strip()]
+
+    subnets = []
+    if os.path.exists(input_subnets_file):
+        with open(input_subnets_file, 'r', encoding='utf-8') as file:
+            subnets = [line.strip() for line in file if line.strip()]
+
+    if input_subnets_file == "Subnets/IPv4/discord.lst":
+        data = {
+            "version": 2,
+            "rules": [
+                {
+                    "domain_suffix": domains
+                },
+                {
+                    "network": ["udp"],
+                    "ip_cidr": subnets,
+                    "port_range": ["50000:65535"]
+                }
+            ]
+        }
+    else:
+        data = {
+            "version": 2,
+            "rules": [
+                {
+                    "domain_suffix": domains,
+                    "ip_cidr": subnets
+                }
+            ]
+        }
+
+    filename = os.path.splitext(os.path.basename(input_subnets_file))[0]
+    output_file_path = os.path.join(output_json_directory, f"{filename}.json")
+
+    with open(output_file_path, 'w', encoding='utf-8') as output_file:
+        json.dump(data, output_file, indent=4)
+
+    print(f"JSON file generated: {output_file_path}")
+
+    srs_file_path = os.path.join(compiled_output_directory, f"{filename}.srs")
+    try:
+        subprocess.run(
+            ["sing-box", "rule-set", "compile", output_file_path, "-o", srs_file_path], check=True
+        )
+        print(f"Compiled .srs file: {srs_file_path}")
+    except subprocess.CalledProcessError as e:
+        print(f"Compile error {output_file_path}: {e}")
+
+
 def prepare_dat_domains(domains_or_dirs, output_name):
     output_lists_directory = 'geosite_data'
 
@@ -335,10 +383,12 @@ def generate_dat_domains(data_path='geosite_data', output_name='geosite.dat', ou
     try:
         subprocess.run(
             ["domain-list-community", f"-datapath={data_path}", f"-outputname={output_name}", f"-outputdir={output_directory}"],
-            check=True
+            check=True,
+            stdout=subprocess.DEVNULL
         )
+        print(f"Compiled .dat file: {output_directory}/{output_name}")
     except subprocess.CalledProcessError as e:
-        print(f"Compile error geosite.dat: {e}")
+        print(f"Compile error {data_path}: {e}")
 
 if __name__ == '__main__':
     # Russia inside
@@ -394,12 +444,14 @@ if __name__ == '__main__':
     generate_srs_for_categories(directories)
 
     # Sing-box subnets
-    generate_srs_subnets(DiscordSubnets)
-    generate_srs_subnets(TwitterSubnets)
-    generate_srs_subnets(MetaSubnets)
+    generate_srs_subnets(TelegramSubnets)
+
+    generate_srs_combined(DiscordSubnets, "Services/discord.lst")
+    generate_srs_combined(TwitterSubnets, "Services/twitter.lst")
+    generate_srs_combined(MetaSubnets, "Services/meta.lst")
 
     # Xray domains
     prepare_dat_domains(directories, 'russia-inside')
     prepare_dat_domains(russia_outside, 'russia-outside')
     prepare_dat_domains(ukraine_inside, 'ukraine-inside')
-    generate_dat_domains()
+    generate_dat_domains()

get-subnets.py

@@ -15,6 +15,7 @@ AS_META = '32934'
 AS_TWITTER = '13414'
 META = 'meta.lst'
 TWITTER = 'twitter.lst'
+TELEGRAM = 'telegram.lst'
 
 # From https://iplist.opencck.org/
 DISCORD_VOICE_V4='https://iplist.opencck.org/?format=text&data=cidr4&site=discord.gg&site=discord.media'
@@ -22,6 +23,8 @@ DISCORD_VOICE_V6='https://iplist.opencck.org/?format=text&data=cidr6&site=discor
 
 DISCORD = 'discord.lst'
 
+TELEGRAM_CIDR_URL = 'https://core.telegram.org/resources/cidr.txt'
+
 subnet_list = []
 
 def subnet_summarization(subnet_list):
@@ -76,6 +79,15 @@ def download_ready_subnets(url_v4, url_v6):
 
     return ipv4_subnets, ipv6_subnets
 
+def download_ready_split_subnets(url):
+    req = urllib.request.Request(url)
+    with urllib.request.urlopen(req) as response:
+        subnets = response.read().decode('utf-8').splitlines()
+
+    ipv4_subnets = [cidr for cidr in subnets if isinstance(ipaddress.ip_network(cidr, strict=False), ipaddress.IPv4Network)]
+    ipv6_subnets = [cidr for cidr in subnets if isinstance(ipaddress.ip_network(cidr, strict=False), ipaddress.IPv6Network)]
+    
+    return ipv4_subnets, ipv6_subnets
 
 def write_subnets_to_file(subnets, filename):
     with open(filename, 'w') as file:
@@ -111,6 +123,11 @@ if __name__ == '__main__':
     write_subnets_to_file(ipv4_discord, f'{IPv4_DIR}/{DISCORD}')
     write_subnets_to_file(ipv6_discord, f'{IPv6_DIR}/{DISCORD}')
 
+    # Telegram
+    ipv4_telegram, ipv6_telegram = download_ready_split_subnets(TELEGRAM_CIDR_URL)
+    write_subnets_to_file(ipv4_telegram, f'{IPv4_DIR}/{TELEGRAM}')
+    write_subnets_to_file(ipv6_telegram, f'{IPv6_DIR}/{TELEGRAM}')
+
     # Legacy name
     copy_file_legacy(f'{IPv4_DIR}/{META}')
     copy_file_legacy(f'{IPv6_DIR}/{META}')