Merge branch '1324-implement-conditional-url-blocking' into 'development'

Resolve "Implement Conditional URL Blocking"

Closes #1324

See merge request !2226

metager/app/MetaGer.php

@@ -89,17 +89,23 @@ class MetaGer
 
     public function __construct($hash = "")
     {
-        # Timer starten
+        # start timer
         $this->starttime = microtime(true);
-        # Versuchen Blacklists einzulesen
+        # Read blocklists
         if (file_exists(config_path() . "/blacklistDomains.txt") && file_exists(config_path() . "/blacklistUrl.txt")) {
             $tmp = file_get_contents(config_path() . "/blacklistDomains.txt");
             $this->domainsBlacklisted = explode("\n", $tmp);
             $tmp = file_get_contents(config_path() . "/blacklistUrl.txt");
-            $this->urlsBlacklisted = explode("\n", $tmp);
+            $lines = explode("\n", $tmp);
+            $filtered_lines = array_filter($lines, function($line) {
+                return strpos(trim($line), '#') !== 0;
+            });
+            # Re-index the array (array_filter preserves keys by default)
+            $filtered_lines = array_values($filtered_lines);
+            $this->urlsBlacklisted = $filtered_lines;
         }
 
-        # Versuchen Blacklists einzulesen
+        # Read blocklists
         if (file_exists(config_path() . "/adBlacklistDomains.txt")) {
             $tmp = file_get_contents(config_path() . "/adBlacklistDomains.txt");
             $this->adDomainsBlacklisted = explode("\n", $tmp);

metager/app/Models/Result.php

@@ -294,7 +294,10 @@ class Result
     {
         if (
             ($this->strippedHost !== "" && (in_array($this->strippedHost, $metager->getDomainBlacklist()) ||
-                in_array($this->strippedLink, $metager->getUrlBlacklist())))
+                in_array($this->strippedLink, $metager->getUrlBlacklist()) ||
+                in_array($this->strippedLink . "|" . strtolower(app(SearchSettings::class)->q), $metager->getUrlBlacklist())
+                )
+            ) 
         ) {
             return true;
         } else {