Fix checks on blog and port containers

Code cleanup

Makefile

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.108
-VERSION=0.107
+MOZ_VERSION=0.112
+VERSION=0.111
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.105
+LAST_VERSION=0.109
 
 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -168,7 +168,7 @@ moz-sign: version clean-artifacts
 	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	$(HOME)/node_modules/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	$(HOME)/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 #--api-url-prefix http://localhost:3000/api/v4
 	make copyss
 	sleep 5
 
@@ -182,7 +182,7 @@ moz-submit: moz-version
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
 	mv manifest.json .manifest.json
 	grep -v update_url .manifest.json > manifest.json
-	$(HOME)/node_modules/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	$(HOME)/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 --verbose #--api-url-prefix http://localhost:3000/api/v4
 	sleep 5
 	mv .manifest.json manifest.json
 
@@ -328,7 +328,7 @@ upload-updatemanifest:
 	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
 
 webext:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
 
 snark-mirror:
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
@@ -345,7 +345,7 @@ wire:
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
 
 ndtest:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
 		-u http://127.0.0.1:7657/home \
 		-u http://127.0.0.1:7657/i2ptunnel \
 		-u http://127.0.0.1:7657/i2psnark \
@@ -359,7 +359,7 @@ ndtest:
 		-u https://ramble.pw/f/i2p \
 
 lht-test:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
 		-u http://localhost:7657/home \
 		-u http://localhost:7657/i2ptunnel \
 		-u http://localhost:7657/i2psnark \

_locales/en/messages.json

@@ -20,7 +20,7 @@
     "description": "Description of the extension."
   },
   "extensionVersion": {
-    "message": "0.107",
+    "message": "0.108",
     "description": "Version of the extension."
   },
   "proxyFailedStatus": {

_locales/es/messages.json

@@ -20,7 +20,7 @@
     "description": "Descripción de la extensión."
   },
   "extensionVersion": {
-    "message": "0,107",
+    "message": "0.108",
     "description": "Versión de la extensión."
   },
   "proxyFailedStatus": {

debian/changelog

@@ -1,9 +1,23 @@
+i2psetproxy.js (0.111-1) UNRELEASED; urgency=low
+
+  * simplify background theme issue fix
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 23:27:27 -0400
+
+i2psetproxy.js (0.109-1) UNRELEASED; urgency=low
+
+  * connection interrupted mid release, retry failed validation. Bump and retry
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+connection interrupted mid release, retry failed validation. Bump and retry
+
 i2psetproxy.js (0.107-1) UNRELEASED; urgency=low
 
   * Small code fixes
   * Fix for interference with non-I2P containers
 
- -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
 
 i2psetproxy.js (0.105-1) UNRELEASED; urgency=low
 

host.js

@@ -24,12 +24,14 @@ function localHost(url) {
     hostname = url.split("/")[0];
   }
   hostname = hostname.split(":")[0];
-  console.log("(isolate) hostname localhost", hostname);
-  console.log("(isolate) url localhost", url);
+  console.log("(urlcheck) hostname localhost", hostname);
+  console.log("(urlcheck) url localhost", url);
   if (hostname === "127.0.0.1") {
-    if (url.indexOf("7669") != -1) return "irc";
+    if (url.indexOf("\:8084") != -1) return "blog";
+    if (url.indexOf("\:7669") != -1) return "irc";
   } else if (hostname === "localhost") {
-    if (url.indexOf("8084") != -1) return "blog";
+    if (url.indexOf("\:8084") != -1) return "blog";
+    if (url.indexOf("\:7669") != -1) return "irc";
   }
 
   return false;

manifest.json

@@ -27,7 +27,7 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.107",
+  "version": "0.112",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {

scrub.js

@@ -442,7 +442,7 @@ var coolheadersSetup = function (e) {
             var tab = browser.tabs.get(e.tabId);
             tab.then(altSrc);
             function altSrc(tab) {
-              console.log("(scrub) X-I2P-LOCATION");
+              console.log("(scrub) X-I2P-LOCATION", header.value);
               let url = new URL(header.value);
               browser.pageAction.setPopup({
                 tabId: e.tabId,
@@ -541,16 +541,16 @@ var coolheadersSetup = function (e) {
 
 function getTabURL(tab) {
   if (tab.url.startsWith("https")) {
-    browser.pageAction.setPopup({
-      tabId: tab.id,
-      popup: "security.html",
-    });
-    browser.pageAction.setIcon({
-      path: "icons/infotoopies.png",
-      tabId: tab.id,
-    });
-    console.log(tab.url);
     if (tab.url.includes(".i2p")) {
+      browser.pageAction.setPopup({
+        tabId: tab.id,
+        popup: "security.html",
+      });
+      browser.pageAction.setIcon({
+        path: "icons/infotoopies.png",
+        tabId: tab.id,
+      });
+      console.log(tab.url);
       //console.log("(background) tabinfo", tabInfo[0].id)
       try {
         browser.tabs