From c785667efea9e579db37c7d450bd3fbe9e7612a0 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 23 Nov 2023 09:56:43 +0100
Subject: [PATCH] Trim leading and trailing spaces and tabs in upstream servers
 (if any)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 gravity.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 4aea4d68..20ad6215 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -553,6 +553,9 @@ gravity_DownloadBlocklistFromUrl() {
         upstream="${upstream%%,*}"
         upstream="${upstream##*[}"
         upstream="${upstream%%]*}"
+        # Trim leading and trailing spaces and tabs
+        upstream="${upstream#"${upstream%%[![:space:]]*}"}"
+        upstream="${upstream%"${upstream##*[![:space:]]}"}"
 
         # Get IP address and port of this upstream server
         local ip_addr port
@@ -567,8 +570,7 @@ gravity_DownloadBlocklistFromUrl() {
         port=443;
         else port=80
         fi
-        bad_list=$(pihole -q -adlist "${domain}" | head -n1 | awk -F 'Match found in ' '{print $2}')
-        echo -e "${OVER}  ${CROSS} ${str} ${domain} is blocked by ${bad_list%:}. Using DNS on ${upstream} to download ${url}";
+        echo -e "${OVER}  ${CROSS} ${str} ${domain} is blocked by one of your lists. Using DNS server ${upstream} instead";
         echo -ne "  ${INFO} ${str} Pending..."
         cmd_ext="--resolve $domain:$port:$ip"
     fi