fix the search thing

host.js

@@ -46,7 +46,11 @@ function extensionHost(url) {
 
 function i2pHostName(url) {
   let hostname = '';
-  if (url.indexOf('://') > -1) {
+  console.log('(hosts)', url);
+  if (url.includes('=')) {
+    lsit = url.split('=');
+    hostname = lsit[lsit.length - 1];
+  } else if (url.indexOf('://') > -1) {
     hostname = url.split('/')[2];
   } else {
     hostname = url.split('/')[0];

privacy.js

@@ -328,7 +328,10 @@ function forgetBrowsingData(storedSettings) {
 
 function i2pHostName(url) {
   let hostname = "";
-  if (url.indexOf("://") > -1) {
+  if (url.includes("=")) {
+    lsit = url.split("=");
+    hostname = lsit[lsit.length - 1];
+  } else if (url.indexOf("://") > -1) {
     hostname = url.split("/")[2];
   } else {
     hostname = url.split("/")[0];

proxy.js

@@ -3,6 +3,7 @@ var webpref = chrome.i18n.getMessage('webPreface');
 var ircpref = chrome.i18n.getMessage('ircPreface');
 var routerpref = chrome.i18n.getMessage('routerPreface');
 var routerprefpriv = chrome.i18n.getMessage('routerPrefacePrivate');
+var ircpref = chrome.i18n.getMessage('ircPreface');
 
 browser.privacy.network.peerConnectionEnabled.set({
   value: true,
@@ -33,6 +34,15 @@ var handleContextProxyRequest = async function(requestDetails) {
       }
       console.log('(proxy), context', context);
       if (context != undefined) {
+        if (context.name == ircpref) {
+          if (!requestDetails.url.includes('7669')) {
+            proxy = {
+              type: getScheme(),
+              host: getHost(),
+              port: getPort(),
+            };
+          }
+        }
         if (context.name == titlepref) {
           if (!requestDetails.url.includes('/i2psnark/')) {
             console.log('URL', requestDetails.url);

scrub.js

@@ -144,6 +144,7 @@ var contextSetup = function(requestDetails) {
   function onContextError() {
     console.log('Context launcher error');
   }
+  console.log('(scrub) host', requestDetails.url);
   //console.log("(isolate)Forcing I2P requests into context");
   try {
     var i2pTabFind = async function(tabId) {
@@ -245,7 +246,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 1 });
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -299,7 +300,7 @@ var contextSetup = function(requestDetails) {
                     console.log('in favor of', tab.id);
                     console.log('with context', tab.cookieStoreId);
                     browser.tabs.remove(tabId.id);
-                    browser.tabs.move(tab.id, { index: 2 });
+                    browser.tabs.move(tab.id, { index: 0 });
                   }
                   for (index = 0; index < tabs.length; index++) {
                     if (index != tabs.length - 1)
@@ -347,7 +348,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 4 });
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -394,7 +395,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 5 });
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -441,7 +442,7 @@ var contextSetup = function(requestDetails) {
                   console.log('in favor of', tab.id);
                   console.log('with context', tab.cookieStoreId);
                   browser.tabs.remove(tabId.id);
-                  browser.tabs.move(tab.id, { index: 3 });
+                  browser.tabs.move(tab.id, { index: 0 });
                 }
                 for (index = 0; index < tabs.length; index++) {
                   if (index != tabs.length - 1)
@@ -489,7 +490,7 @@ var contextSetup = function(requestDetails) {
                     console.log('in favor of', tab.id);
                     console.log('with context', tab.cookieStoreId);
                     browser.tabs.remove(tabId.id);
-                    browser.tabs.move(tab.id, { index: 6 });
+                    browser.tabs.move(tab.id, { index: 0 });
                   }
                   for (index = 0; index < tabs.length; index++) {
                     if (index != tabs.length - 1)
@@ -617,6 +618,13 @@ var contextSetup = function(requestDetails) {
     if (requestDetails.tabId > 0) {
       var tab = tabGet(requestDetails.tabId);
       if (i2pHost(requestDetails.url)) {
+        var thn = i2pHostName(requestDetails.url);
+        if (requestDetails.url.includes('=' + thn)) {
+          console.log('(scrub)checking search hostnames =' + thn);
+          var tpt = requestDetails.url.split('=' + thn, 2);
+          requestDetails.url = 'http://' + thn + tpt[1];
+          //          requestDetails.url = requestDetails.url.replace(requestDetails.url.split("="+i2pHostName(requestDetails.url), i2pHostName(requestDetails.url))
+        }
         var setcookie = browser.cookies.set({
           firstPartyDomain: i2pHostName(requestDetails.url),
           url: requestDetails.url,