Merge branch 'fix-the-search-thing' into 'master'

Fix the search thing

See merge request idk/I2P-in-Private-Browsing-Mode-Firefox!14

Makefile

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.86
-VERSION=0.85
+MOZ_VERSION=0.88
+VERSION=0.87
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.83
+LAST_VERSION=0.85
 
 YELLOW=F7E59A
 ORANGE=FFC56D

background.js

@@ -186,25 +186,28 @@ function themeWindow(window) {
       });
     }
   }
+  function browserTheme() {
+    console.log('Active in I2P window');
+    if (window.incognito) {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#363A68',
+          toolbar: '#363A68',
+        },
+      });
+    } else {
+      browser.theme.update(window.id, {
+        colors: {
+          frame: '#363A68',
+          toolbar: '#363A68',
+        },
+      });
+    }
+  }
   function logTabs(tabInfo) {
     function onContextGotTheme(context) {
       if (context.name == titlepref) {
-        console.log('Active in I2P window');
-        if (window.incognito) {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#363A68',
-              toolbar: '#363A68',
-            },
-          });
-        } else {
-          browser.theme.update(window.id, {
-            colors: {
-              frame: '#363A68',
-              toolbar: '#363A68',
-            },
-          });
-        }
+        browserTheme();
         if (tabInfo[0].url.startsWith('https://')) {
           browser.pageAction.setPopup({
             tabId: tabInfo[0].id,

debian/changelog

@@ -1,3 +1,11 @@
+i2psetproxy.js (0.87-1) UNRELEASED; urgency=low
+
+  * Disable searching for i2p sites in non-i2p search engines
+  * Add contexts for i2pbote and Dispatch
+  * 
+
+ -- idk <hankhill19580@gmail.com>  Sat, 10 NOV 2020 1:33:50 -0400
+
 i2psetproxy.js (0.85-1) UNRELEASED; urgency=low
 
   * Fix a bug which was causing i2psnark to fail to isolate.

host.js

@@ -46,7 +46,24 @@ function extensionHost(url) {
 
 function i2pHostName(url) {
   let hostname = '';
-  if (url.indexOf('://') > -1) {
+  console.log('(hosts)', url);
+  if (url.includes('=')) {
+    if (url.includes('.i2p')) {
+      lsit = url.split('=');
+      for (let item in lsit) {
+        var items = lsit[item].split(`\ % `); //"\%")
+        for (let p in items) {
+          if (items[p].includes('.i2p')) {
+            hostname = items[p].replace('3D', 1);
+          }
+          break;
+        }
+        if (hostname != '') {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf('://') > -1) {
     hostname = url.split('/')[2];
   } else {
     hostname = url.split('/')[0];

privacy.js

@@ -328,7 +328,24 @@ function forgetBrowsingData(storedSettings) {
 
 function i2pHostName(url) {
   let hostname = "";
-  if (url.indexOf("://") > -1) {
+  console.log("(hosts)", url);
+  if (url.includes("=")) {
+    if (url.includes(".i2p")) {
+      lsit = url.split("=");
+      for (let item in lsit) {
+        var items = lsit[item].split(`\%`); //"\%")
+        for (let p in items) {
+          if (items[p].includes(".i2p")) {
+            hostname = items[p].replace("3D", 1);
+          }
+          break;
+        }
+        if (hostname != "") {
+          break;
+        }
+      }
+    }
+  } else if (url.indexOf("://") > -1) {
     hostname = url.split("/")[2];
   } else {
     hostname = url.split("/")[0];
@@ -338,6 +355,9 @@ function i2pHostName(url) {
 
 function i2pHost(url) {
   let hostname = i2pHostName(url);
+  if (hostname.endsWith(".i2p")) {
+    console.log("(hostname) i2p", hostname);
+  }
   return hostname.endsWith(".i2p");
 }