From a703a075f4b0dbc7e475c3c77e352e1bf27e9c25 Mon Sep 17 00:00:00 2001
From: hackademix <giorgio@maone.net>
Date: Sun, 20 Feb 2022 08:58:41 +0100
Subject: [PATCH] Fix for first party context policy ignored on first load in
 new tabs (thanks ayi for reporting).

---
 src/bg/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bg/main.js b/src/bg/main.js
index 7dacfcf1..c256a33a 100644
--- a/src/bg/main.js
+++ b/src/bg/main.js
@@ -232,7 +232,10 @@
       // contextualData (e.g. a request details object) must contain a tab, a tabId or a documentUrl
       // (used as a fallback if tab's top URL cannot be retrieved, e.g. in service workers)
       let {tab, tabId, documentUrl, url} = contextualData;
-      if (!tab) tab = tabId !== -1 && TabCache.get(tabId);
+      if (!tab) {
+        if (contextualData.type === "main_frame") return url;
+        tab = tabId !== -1 && TabCache.get(tabId);
+      }
       return tab && tab.url || documentUrl || url;
     },
     requestCan(request, capability) {