From f16b33bf4a24e76a49d8e954b25026c923de0013 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Fri, 11 Apr 2025 20:50:34 -0400
Subject: [PATCH] move extension scopes into affixed prefs.js

---
 VERSION.md            | 16 ++++++++--------
 arkenfox.number       |  2 +-
 build.xml             | 43 +++++++++++++++++++++++++++++++++++++------
 scripts/build.number  |  4 ++--
 src/prefs.js          |  6 +++++-
 src/user-overrides.js |  4 ----
 6 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/VERSION.md b/VERSION.md
index 234b914..31d519b 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -6,23 +6,23 @@ Extension Versions
 
 ```md
 i2p-in-private-browsing
-2.7.0
-https://addons.mozilla.org/firefox/downloads/file/4364373/i2p_in_private_browsing-2.7.0.xpi
+2.8.2
+https://addons.mozilla.org/firefox/downloads/file/4441161/i2p_in_private_browsing-2.8.2.xpi
 noscript
 12.1.1
 https://addons.mozilla.org/firefox/downloads/file/4411102/noscript-12.1.1.xpi
 localcdn-fork-of-decentraleyes
-2.6.76
-https://addons.mozilla.org/firefox/downloads/file/4401439/localcdn_fork_of_decentraleyes-2.6.76.xpi
+2.6.79
+https://addons.mozilla.org/firefox/downloads/file/4464649/localcdn_fork_of_decentraleyes-2.6.79.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.19.1
-https://addons.mozilla.org/firefox/downloads/file/4352350/javascript_restrictor-0.19.1.xpi
+0.20.1
+https://addons.mozilla.org/firefox/downloads/file/4471377/javascript_restrictor-0.20.1.xpi
 ublock-origin
-1.61.2
-https://addons.mozilla.org/firefox/downloads/file/4391011/ublock_origin-1.61.2.xpi
+1.63.2
+https://addons.mozilla.org/firefox/downloads/file/4458450/ublock_origin-1.63.2.xpi
 ```
 
 ## Chromium
diff --git a/arkenfox.number b/arkenfox.number
index 15a2337..ccfee9b 100644
--- a/arkenfox.number
+++ b/arkenfox.number
@@ -1 +1 @@
-arkenfox.number=105.0
+arkenfox.number=135.0
diff --git a/build.xml b/build.xml
index bdcf239..c60f35e 100755
--- a/build.xml
+++ b/build.xml
@@ -285,13 +285,34 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="checkout" />
             <arg value="${arkenfox.number}" />
         </exec>
+        <exec executable="grep" osfamily="unix" output="user.js/tmp.user.js">
+            <arg value="-v" />
+            <arg value="autoDisableScopes" />
+            <arg value="user.js/user.js" />
+        </exec>
+        <exec executable="grep" osfamily="unix" output="user.js/user.js">
+            <arg value="-v" />
+            <arg value="enabledScopes" />
+            <arg value="user.js/tmp.user.js" />
+        </exec>
+        <copy file="user.js/user.js" tofile="src/i2p.firefox.usability.profile/user.js"/>
     </target>
 
     <target name="userJs" depends="i2pFirefoxBaseUserJs,i2pFirefoxUsabilityUserJs">
     </target>
     <target name="i2pFirefoxBaseUserJs" depends="arkenfoxCheckout">
+        <exec executable="grep" osfamily="unix" output="user.js/user.js">
+            <arg value="-v" />
+            <arg value="autoDisableScopes" />
+            <arg value="user.js/user.js" />
+        </exec>
+        <exec executable="grep" osfamily="unix" output="user.js/user.js">
+            <arg value="-v" />
+            <arg value="enabledScopes" />
+            <arg value="user.js/user.js" />
+        </exec>
         <copy file="user.js/user.js" tofile="src/i2p.firefox.base.profile/user.js"/>
-        <exec executable="sed" osfamily="unix">
+        <!--<exec executable="sed" osfamily="unix">
             <arg value="-i" />
             <arg value='s|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g' />
             <arg value="src/i2p.firefox.base.profile/user.js" />
@@ -300,7 +321,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-i" />
             <arg value='s|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' />
             <arg value="src/i2p.firefox.base.profile/user.js" />
-        </exec>
+        </exec>-->
         <exec executable="sed" osfamily="unix">
             <arg value="-i" />
             <arg value='s|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' />
@@ -308,8 +329,18 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         </exec>
     </target>
     <target name="i2pFirefoxUsabilityUserJs" depends="arkenfoxCheckout">
+        <exec executable="grep" osfamily="unix" output="user.js/tmp.user.js">
+            <arg value="-v" />
+            <arg value="autoDisableScopes" />
+            <arg value="user.js/user.js" />
+        </exec>
+        <exec executable="grep" osfamily="unix" output="user.js/user.js">
+            <arg value="-v" />
+            <arg value="enabledScopes" />
+            <arg value="user.js/tmp.user.js" />
+        </exec>
         <copy file="user.js/user.js" tofile="src/i2p.firefox.usability.profile/user.js"/>
-        <exec executable="sed" osfamily="unix">
+        <!--<exec executable="sed" osfamily="unix">
             <arg value="-i" />
             <arg value='s|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g' />
             <arg value="src/i2p.firefox.usability.profile/user.js" />
@@ -318,7 +349,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-i" />
             <arg value='s|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' />
             <arg value="src/i2p.firefox.usability.profile/user.js" />
-        </exec>
+        </exec>-->
         <exec executable="sed" osfamily="unix">
             <arg value="-i" />
             <arg value='s|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' />
@@ -995,7 +1026,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="" />
         </exec>
     </target>
-    <target name="i2pFirefoxBaseProfile" depends="buildNum">
+    <target name="i2pFirefoxBaseProfile" depends="buildNum,i2pFirefoxBaseUserJs">
         <mkdir dir="src/i2p.firefox.base.profile/extensions/" />
         <copy file="src/prefs.js" tofile="src/i2p.firefox.base.profile/prefs.js" />
         <copy file="src/user-overrides.js" tofile="src/i2p.firefox.base.profile/user-overrides.js" />
@@ -1031,7 +1062,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         </exec>
     </target>
 
-    <target name="i2pFirefoxUsabilityProfile" depends="buildNum">
+    <target name="i2pFirefoxUsabilityProfile" depends="buildNum, i2pFirefoxUsabilityUserJs">
         <mkdir dir="src/i2p.firefox.usability.profile/extensions/" />
         <copy file="src/prefs.js" tofile="src/i2p.firefox.usability.profile/prefs.js" />
         <copy file="src/user-overrides.js" tofile="src/i2p.firefox.usability.profile/user-overrides.js" />
diff --git a/scripts/build.number b/scripts/build.number
index c1e234f..413b191 100644
--- a/scripts/build.number
+++ b/scripts/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Jan 07 18:04:41 EST 2025
-build.number=805
+#Fri Apr 11 20:42:48 EDT 2025
+build.number=815
diff --git a/src/prefs.js b/src/prefs.js
index 8bc23d0..5d5a1f5 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -45,4 +45,8 @@ user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
 user_pref("browser.newtabpage.activity-stream.default.sites", "http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/");
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
-user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
\ No newline at end of file
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
+
+// Allow extensions ONLY from the profile directory
+user_pref("extensions.enabledScopes", 1); // [HIDDEN PREF]
+user_pref("extensions.autoDisableScopes", 0); // [HIDDEN PREF]
\ No newline at end of file
diff --git a/src/user-overrides.js b/src/user-overrides.js
index d4e5ac9..0099df0 100644
--- a/src/user-overrides.js
+++ b/src/user-overrides.js
@@ -172,8 +172,6 @@ user_pref("dom.serviceWorkers.enabled", false);
 user_pref("dom.serviceWorkers.interception.enabled", false);
 user_pref("dom.storage.enabled", false);
 user_pref("dom.webaudio.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.enabledScopes", 1);
 user_pref("extensions.getAddons.cache.enabled", false);
 user_pref("extensions.getAddons.showPane", false);
 user_pref("extensions.pocket.enabled", false);
@@ -240,8 +238,6 @@ user_pref("dom.w3c_touch_events.enabled", false);
 user_pref("browser.privatebrowsing.autostart", false);
 user_pref("browser.display.use_system_colors", false);
 user_pref("dom.image-lazy-loading.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.enabledScopes", 1);
 user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
 user_pref("dom.security.https_only_mode", false);