From 2e87e6e0df3d78144096ddd37d8199cb590b3249 Mon Sep 17 00:00:00 2001
From: tearfur <46261767+tearfur@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:57:37 +0800
Subject: [PATCH] Use hostname instead of domain name in tracker filter list

Co-authored-by: Chocobo1 <Chocobo1@users.noreply.github.com>

PR #19062.
Closes #19035.
---
 .../trackersfilterwidget.cpp                  | 10 +++----
 src/webui/www/private/scripts/client.js       | 26 ++++---------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/gui/transferlistfilters/trackersfilterwidget.cpp b/src/gui/transferlistfilters/trackersfilterwidget.cpp
index 6e15baa57..e2fbfac9a 100644
--- a/src/gui/transferlistfilters/trackersfilterwidget.cpp
+++ b/src/gui/transferlistfilters/trackersfilterwidget.cpp
@@ -62,18 +62,14 @@ namespace
 
     QString getHost(const QString &url)
     {
-        // We want the domain + tld. Subdomains should be disregarded
-        // If failed to parse the domain or IP address, original input should be returned
+        // We want the hostname.
+        // If failed to parse the domain, original input should be returned
 
         const QString host = QUrl(url).host();
         if (host.isEmpty())
             return url;
 
-        // host is in IP format
-        if (!QHostAddress(host).isNull())
-            return host;
-
-        return host.section(u'.', -2, -1);
+        return host;
     }
 
     const QString NULL_HOST = u""_qs;
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index a4999b0a6..8cfacac9d 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -95,28 +95,18 @@ const getShowFiltersSidebar = function() {
     return (show === null) || (show === 'true');
 };
 
-const isValidIpAddress = (() => {
-    const v4 = '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\/([0-9]|[1-2][0-9]|3[0-2]))?$';
-    const v6segment = '[0-9A-Fa-f]{1,4}';
-    const v6 = `^\\s*(((${v6segment}:){7}(${v6segment}|:))|((${v6segment}:){6}(:${v6segment}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|((${v6segment}:){5}(((:${v6segment}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|((${v6segment}:){4}(((:${v6segment}){1,3})|((:${v6segment})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|((${v6segment}:){3}(((:${v6segment}){1,4})|((:${v6segment}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|((${v6segment}:){2}(((:${v6segment}){1,5})|((:${v6segment}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|((${v6segment}:){1}(((:${v6segment}){1,6})|((:${v6segment}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:${v6segment}){1,7})|((:${v6segment}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*(\\/(\\d|\\d\\d|1[0-1]\\d|12[0-8]))?$`;
-    const ipRegex = new RegExp(`(?:^${v4}$)|(?:^${v6}$)`);
-
-    return (ip) => ipRegex.test(ip);
-})();
-
 // getHost emulate the GUI version `QString getHost(const QString &url)`
 function getHost(url) {
-    // We want the domain + tld. Subdomains should be disregarded
-    // If failed to parse the domain or IP address, original input should be returned
+    // We want the hostname.
+    // If failed to parse the domain, original input should be returned
 
-    const scheme = url.slice(0, 6).toLowerCase();
-    if (!(scheme.startsWith('http:') || scheme.startsWith('https:') || scheme.startsWith('udp:'))) {
+    if (!/^(?:https?|udp):/i.test(url)) {
         return url;
     }
 
     try {
         // hack: URL can not get hostname from udp protocol
-        const parsedUrl = new URL(url.replace(/^udp:/, 'https:'));
+        const parsedUrl = new URL(url.replace(/^udp:/i, 'https:'));
         // host: "example.com:8443"
         // hostname: "example.com"
         const host = parsedUrl.hostname;
@@ -124,13 +114,7 @@ function getHost(url) {
             return url;
         }
 
-        // host is in IP format
-        if (isValidIpAddress(host)) {
-            return host;
-        }
-
-        // TODO: support TLDs like .co.uk
-        return host.split(/\./).slice(-2).join('.');
+        return host;
     }
     catch (error) {
         return url;