Merge branch 'development' into development-v6-merge-development (resolved conflicts)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

advanced/Scripts/query.sh

@@ -27,7 +27,7 @@ colfile="/opt/pihole/COL_TABLE"
 # Source api functions
 . "${PI_HOLE_INSTALL_DIR}/api.sh"
 
-Help(){
+Help() {
     echo "Usage: pihole -q [option] <domain>
 Example: 'pihole -q --partial domain.com'
 Query the adlists for a specified domain
@@ -36,11 +36,10 @@ Options:
   --partial            Search the adlists for partially matching domains
   --all                Return all query matches within the adlists
   -h, --help           Show this help dialog"
-  exit 0
+    exit 0
 }
 
-
-GenerateOutput(){
+GenerateOutput() {
     local data gravity_data lists_data num_gravity num_lists search_type_str
     local gravity_data_csv lists_data_csv line current_domain
     data="${1}"
@@ -52,13 +51,13 @@ GenerateOutput(){
     gravity_data=$(printf %s "${data}" | jq '.search.gravity  | group_by(.address) | map({ address: (.[0].address), domains: [.[] | .domain] })')
 
     # number of objects in each json
-    num_gravity=$(printf %s "${gravity_data}" | jq length )
-    num_lists=$(printf %s "${lists_data}" | jq length )
+    num_gravity=$(printf %s "${gravity_data}" | jq length)
+    num_lists=$(printf %s "${lists_data}" | jq length)
 
     if [ "${partial}" = true ]; then
-      search_type_str="partially"
+        search_type_str="partially"
     else
-      search_type_str="exactly"
+        search_type_str="exactly"
     fi
 
     # Results from allow/deny list
@@ -66,7 +65,7 @@ GenerateOutput(){
     if [ "${num_lists}" -gt 0 ]; then
         # Convert the data to a csv, each line is a "domain,type" string
         # not using jq's @csv here as it quotes each value individually
-        lists_data_csv=$(printf %s "${lists_data}" | jq --raw-output '.[] | [.domain, .type] | join(",")' )
+        lists_data_csv=$(printf %s "${lists_data}" | jq --raw-output '.[] | [.domain, .type] | join(",")')
 
         # Generate output for each csv line, separating line in a domain and type substring at the ','
         echo "${lists_data_csv}" | while read -r line; do
@@ -79,7 +78,7 @@ GenerateOutput(){
     if [ "${num_gravity}" -gt 0 ]; then
         # Convert the data to a csv, each line is a "URL,domain,domain,...." string
         # not using jq's @csv here as it quotes each value individually
-        gravity_data_csv=$(printf %s "${gravity_data}" | jq --raw-output '.[] | [.address, .domains[]] | join(",")' )
+        gravity_data_csv=$(printf %s "${gravity_data}" | jq --raw-output '.[] | [.address, .domains[]] | join(",")')
 
         # Generate line-by-line output for each csv line
         echo "${gravity_data_csv}" | while read -r line; do
@@ -90,7 +89,7 @@ GenerateOutput(){
             # cut off URL, leaving "domain,domain,...."
             line=${line#*,}
             # print each domain and remove it from the string until nothing is left
-            while  [ ${#line} -gt 0 ]; do
+            while [ ${#line} -gt 0 ]; do
                 current_domain=${line%%,*}
                 printf '    - %s\n' "${COL_GREEN}${current_domain}${COL_NC}"
                 # we need to remove the current_domain and the comma in two steps because
@@ -103,17 +102,17 @@ GenerateOutput(){
     fi
 }
 
-Main(){
+Main() {
     local data
 
     if [ -z "${domain}" ]; then
-        echo "No domain specified"; exit 1
+        echo "No domain specified"
+        exit 1
     fi
     # domains are lowercased and converted to punycode by FTL since
     # https://github.com/pi-hole/FTL/pull/1715
     # no need to do it here
 
-
     # Test if the authentication endpoint is available
     TestAPIAvailability
 
@@ -137,13 +136,13 @@ Main(){
 
 # Process all options (if present)
 while [ "$#" -gt 0 ]; do
-  case "$1" in
-    "-h" | "--help"     ) Help;;
-    "--partial"         ) partial="true";;
-    "--all"             ) max_results=10000;; # hard-coded FTL limit
-    *                   ) domain=$1;;
-  esac
-  shift
+    case "$1" in
+    "-h" | "--help") Help ;;
+    "--partial") partial="true" ;;
+    "--all") max_results=10000 ;; # hard-coded FTL limit
+    *) domain=$1 ;;
+    esac
+    shift
 done
 
 Main "${domain}"