Skip to content

Lightpanda: the headless browser designed for AI and automation

`HttpClient.isAdBlocked` should just delegate `Adblocker.isBlocked`

Halil Durak0a6d43c2bb7d
diff --git a/src/network/HttpClient.zig b/src/network/HttpClient.zig
index 9430e00e5..a72f122a7 100644
--- a/src/network/HttpClient.zig
+++ b/src/network/HttpClient.zig
@@ -404,16 +404,7 @@ fn isUrlBlocked(self: *const Client, transfer: *const Transfer) bool {
if (self.url_blocklist) |*blocklist| {
if (blocklist.isBlocked(req.url)) return true;
}
- return self.isAdblocked(transfer);
-}
-
-fn isAdblocked(self: *const Client, transfer: *const Transfer) bool {
- const blocker = if (self.network.adblocker) |*b| b else return false;
- var buffers: AdBlocker.Request.Buffers = undefined;
- const target = AdBlocker.Request.fromHttp(transfer, &buffers) orelse return false;
- const verdict = blocker.match(target);
- lp.metrics.adblock_verdicts.incr(verdict);
- return verdict == .blocked;
+ return if (self.network.adblocker) |*blocker| blocker.isBlocked(transfer) else false;
}
fn adblockSourceUrl(transfer: *const Transfer) ?[]const u8 {
diff --git a/src/network/adblock/AdBlocker.zig b/src/network/adblock/AdBlocker.zig
index 570604e35..a06111cd7 100644
--- a/src/network/adblock/AdBlocker.zig
+++ b/src/network/adblock/AdBlocker.zig
@@ -23,6 +23,7 @@ const Io = std.Io;
const Allocator = std.mem.Allocator;
const Config = @import("../../Config.zig");
+const HttpClient = @import("../HttpClient.zig");
const Parser = @import("Parser.zig");
const Engine = @import("Engine.zig");
@@ -306,6 +307,14 @@ fn addToTrie(self: *AdBlocker, root: u32, hostname: []const u8) !void {
pub const Verdict = enum { none, allowed, blocked };
+pub fn isBlocked(self: *const AdBlocker, transfer: *const HttpClient.Transfer) bool {
+ var buffers: Request.Buffers = undefined;
+ const request = Request.fromHttp(transfer, &buffers) orelse return false;
+ const verdict = self.match(request);
+ lp.metrics.adblock_verdicts.incr(verdict);
+ return verdict == .blocked;
+}
+
/// The verdict for one request.
/// `$important` blocks outrank exceptions, which outrank plain blocks; same as uBO.
pub fn match(self: *const AdBlocker, request: Request) Verdict {