Fix Adblock not working (#268)

Check the subscription's whitelist and pattern for a match and insert the result into the cache.

1 files changed, 15 insertions, 1 deletions

diff --git a/extensions/adblock/subscription.vala b/extensions/adblock/subscription.vala
index 4bc191ed..d262ba81 100644
--- a/extensions/adblock/subscription.vala
+++ b/extensions/adblock/subscription.vala
@@ -355,7 +355,21 @@ namespace Adblock {
                 debug ("%s for %s (%s)", directive.to_string (), request_uri, page_uri);
                 return directive;
             }
-            return null;
+
+            try {
+                //The uri is either Allowed(whitelist), Blocked(pattern), or neither
+                directive = whitelist.match (request_uri, page_uri);
+                if (directive == null) {
+                    directive = pattern.match (request_uri, page_uri);
+                }
+            } catch (Error error) {
+                critical ("Error matching %s %s: %s", request_uri, uri, error.message);
+            }
+
+            if (directive != null)
+                cache.insert (request_uri, directive);
+
+            return directive;
         }
     }
 }