Branding for vendor.js

2 files changed, 32 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1f8cff2..dfb375c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -79,7 +79,7 @@ sha256sums=('cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707'
             '642b214b219e3c7668abed7119c3fadaeee9da80e98aba93a42ea8128eccd73c'
             '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a'
             '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa'
-            'fc693c1ed6a93498899714f550f9355a1b92c6692a9203bbcfee83dfd7393764'
+            '2788719e3f619e509aa50c0facf98fb5dd24d71220b096e698adeaeee492b929'
             'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee'
             'ce1765c7812da53dc555103d54998d57890def127aa034b37f21dbfab65dde65'
             'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
diff --git a/vendor.js b/vendor.js
index 6e18dff..a36c5d3 100644
--- a/vendor.js
+++ b/vendor.js
@@ -5,11 +5,8 @@ pref("accessibility.force_disabled", 1);
 
 pref("alerts.showFavicons", false); //Breaks favicons
 
-pref("app.faqURL",				"https://libreplanet.org/wiki/Group:IceCat/FAQ");
-pref("app.privacyURL",				"https://www.gnu.org/software/gnuzilla/");
-pref("app.releaseNotesURL",				"https://savannah.gnu.org/news/?group=gnuzilla");
+pref("app.releaseNotesURL",				"https://www.mozilla.org/en-US/firefox/notes/");
 pref("app.shield.optoutstudies.enabled", false);
-pref("app.support.baseURL",				"https://libreplanet.org/wiki/Group:IceCat/");
 pref("app.update.auto", 						false);
 pref("app.update.checkInstallTime", 			false);
 pref("app.update.enabled",					false);
@@ -17,9 +14,6 @@ pref("app.update.service.enabled", false);
 pref("app.update.silent", false);
 pref("app.update.staging.enabled",				false); 
 pref("app.update.url",				"");
-pref("app.update.url.details",				"https://www.gnu.org/software/gnuzilla/");
-pref("app.update.url.manual",				"https://www.gnu.org/software/gnuzilla/");
-pref("app.vendorURL",				"https://www.gnu.org/software/gnuzilla/");
 
 //pref("beacon.enabled",					true);
 pref("beacon.enabled",					false);  //Conflict
@@ -46,8 +40,7 @@ pref("browser.cache.memory.capacity", 1048576);  //Hidden
 pref("browser.cache.offline.enable",			false);
 pref("browser.crashReports.unsubmittedCheck.autoSubmit", 		false);
 pref("browser.crashReports.unsubmittedCheck.enabled", 		false);
-//pref("browser.customizemode.tip0.learnMoreUrl",				"https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
-pref("browser.customizemode.tip0.learnMoreUrl",				"https://libreplanet.org/wiki/Group:IceCat/Tour");  //Conflict
+pref("browser.customizemode.tip0.learnMoreUrl",				"https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
 pref("browser.disableResetPrompt", true);
 //pref("browser.display.use_document_fonts",			1);
 pref("browser.display.use_document_fonts",			0);  //Conflict
@@ -88,6 +81,8 @@ pref("browser.onboarding.enabled", false);
 //pref("browser.pagethumbnails.capturing_disabled",		true); //Breaks page thumbnails
 pref("browser.pagethumbnails.capturing_disabled",		false); //Breaks page thumbnails if true
 pref("browser.ping-centre.telemetry",		false);
+pref("browser.ping-centre.production.endpoint",		"https://127.0.0.1");  //Conflict
+pref("browser.ping-centre.staging.endpoint",		"https://127.0.0.1");  //Conflict
 //pref("browser.privatebrowsing.autostart",			true);
 pref("browser.privatebrowsing.autostart",			false);  //Conflict
 pref("browser.reader.detectedFirstArticle", true);
@@ -174,8 +169,7 @@ pref("browser.taskbar.lists.recent.enabled", false);
 pref("browser.taskbar.lists.tasks.enabled", false);
 pref("browser.taskbar.previews.enable", false);
 pref("browser.uitour.enabled",				false);
-//pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
-pref("browser.uitour.url", "https://libreplanet.org/wiki/Group:IceCat/Tour");  //Conflict
+pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
 pref("browser.urlbar.decodeURLsOnCopy", true);          
 pref("browser.urlbar.filter.javascript",			true);
 pref("browser.urlbar.maxHistoricalSearchSuggestions", 0);
@@ -225,7 +219,7 @@ pref("devtools.debugger.chrome-debugging-host", "127.0.0.1");
 pref("devtools.debugger.force-local",			true);
 pref("devtools.debugger.prompt-connection", true);
 pref("devtools.debugger.remote-enabled",			false);
-pref("devtools.devedition.promo.url", "https://www.gnu.org/software/gnuzilla/");  //Makes sense to me
+pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/");
 pref("devtools.webide.autoinstallADBHelper",		false);
 pref("devtools.webide.enabled",				false);
 
@@ -243,8 +237,8 @@ pref("dom.keyboardevent.dispatch_during_composition", false);
 //pref("dom.idle-observers-api.enabled", true);
 pref("dom.idle-observers-api.enabled", false);  //Conflict
 pref("dom.imagecapture.enabled", false);
-//pref("dom.indexedDB.enabled",		true);
-pref("dom.indexedDB.enabled",		false);  //Conflict
+pref("dom.indexedDB.enabled",		true);  //required by noscript
+//pref("dom.indexedDB.enabled",		false);  //Conflict
 pref("dom.input.dirpicker", false);
 pref("dom.IntersectionObserver.enabled", false);
 //pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled",	true);
@@ -276,8 +270,8 @@ pref("dom.push.serverURL", "");
 pref("dom.push.userAgentID", "");
 pref("dom.securecontext.whitelist_onions", true);
 pref("dom.serviceWorkers.enabled",				false);
-//pref("dom.storage.enabled",		true);
-pref("dom.storage.enabled",		false);  //Conflict
+pref("dom.storage.enabled",		true);  //required by noscript
+//pref("dom.storage.enabled",		false);  //Conflict
 pref("dom.storageManager.enabled", false);
 pref("dom.vibrator.enabled", false);
 pref("dom.vr.enabled",						false);
@@ -319,9 +313,10 @@ pref("extensions.getAddons.get.url", "");  //Conflict
 pref("extensions.getAddons.getWithPerformance.url", "");  //Conflict
 //pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
 pref("extensions.getAddons.recommended.url", "");  //Conflict
+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
 pref("extensions.getAddons.showPane", false);
+pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
 pref("extensions.hotfix.id", "");
-pref("extensions.icecathome.intl.accept_languages", "en-US, en");
 //pref("extensions.pendingOperations", false);
 //pref("extensions.pocket.enabled",				true);
 pref("extensions.pocket.enabled",				false);  //Conflict
@@ -336,12 +331,12 @@ pref("extensions.update.autoUpdateDefault", false);  //Conflict
 pref("extensions.update.background.url", "");  //Conflict
 //pref("extensions.update.enabled",				true);
 pref("extensions.update.enabled",				false);  //Conflict
-pref("extensions.webcompat-reporter.enabled", false); 
+pref("extensions.webcompat-reporter.enabled", false);
+pref("extensions.webcompat-reporter.newIssueEndpoint", "");
 pref("extensions.webextensions.keepStorageOnUninstall", false);
 pref("extensions.webextensions.keepUuidOnUninstall", false);
 //pref("extensions.webextensions.remote", true); //If you want e10  //Breaks alot of WebExt currently
-//pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
-pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat");  //Conflict
+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
@@ -364,7 +359,7 @@ pref("gfx.font_rendering.opentype_svg.enabled",		false);
 pref("gfx.layerscope.enabled", false);
 pref("gfx.offscreencanvas.enabled", false);
 
-pref("identity.mobilepromo.android",				"https://f-droid.org/repository/browse/?fdid=org.gnu.icecat");
+pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/");
 pref("identity.mobilepromo.ios",				"");
 
 pref("intl.charset.default", "windows-1252");
@@ -401,6 +396,7 @@ pref("media.autoplay.enabled", false);  //Conflict
 //pref("media.block-autoplay-until-in-foreground", false);
 pref("media.block-autoplay-until-in-foreground", true);  //Conflict
 pref("media.cache_size", 0);
+pref("media.decoder-doctor.new-issue-endpoint", "");
 pref("media.eme.enabled",				false);
 pref("media.getusermedia.audiocapture.enabled",	false);
 pref("media.getusermedia.browser.enabled", false);
@@ -444,8 +440,12 @@ pref("network.auth.subresource-img-cross-origin-http-auth-allow", false);
 pref("network.captive-portal-service.enabled", false);
 pref("network.cookie.cookieBehavior",			2);
 pref("network.cookie.leave-secure-alone", true);
-pref("network.cookie.lifetimePolicy",			2);
+//pref("network.cookie.lifetimePolicy",			2);
+pref("network.cookie.lifetimePolicy",			0);  //Conflict //required by ublock origin
 pref("network.cookie.thirdparty.sessionOnly",		true);
+pref("network.dnsCacheEntries",			0);
+pref("network.dnsCacheExpiration",			0);
+pref("network.dnsCacheExpirationGracePeriod",			0);
 pref("network.dns.blockDotOnion",				true);
 pref("network.dns.disablePrefetch",			true);
 pref("network.dns.disablePrefetchFromHTTPS",		true);  //Hidden
@@ -459,11 +459,12 @@ pref("network.http.max-persistent-connections-per-proxy", 256);
 pref("network.http.redirection-limit", 10);  //Conflict
 pref("network.http.referer.hideOnionSource", true);
 pref("network.http.referer.spoofSource",			false);
-//pref("network.http.sendRefererHeader", 0);            //Breaks many sites
-//pref("network.http.referer.trimmingPolicy", 2);       //Breaks many sites, using RAS/refcontrol is easier
-//pref("network.http.referer.XOriginPolicy", 2);        //Breaks many sites, using RAS/refcontrol is easier
+//pref("network.http.sendRefererHeader", 0);            //Breaks many sites, use privacy settings addon to quick toggle
+//pref("network.http.referer.trimmingPolicy", 2);       //Breaks many sites
+//pref("network.http.referer.XOriginPolicy", 2);        //Breaks many sites
 //pref("network.http.referer.XOriginTrimmingPolicy", 0);  //Breaks many sites
 //pref("network.http.referer.userControlPolicy", 0);    //Breaks many sites
+pref("network.http.referer.userControlPolicy", 1);    //A better default
 pref("network.http.spdy.enabled", false);
 pref("network.http.spdy.enabled.deps", false);
 pref("network.http.spdy.enabled.http2", false);
@@ -681,7 +682,10 @@ pref("view_source.tab", false);  //Conflict
 //pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https://content.cdn.mozilla.net https://input.mozilla.org https://support.mozilla.org https://install.mozilla.org");
 pref("webchannel.allowObject.urlWhitelist", "");  //Conflict
 
-pref("webextensions.storage.sync.enabled", false);
+//pref("webextensions.storage.sync.enabled", false);
+pref("webextensions.storage.sync.enabled", true);  //required by noscript
+pref("webextensions.storage.sync.serverURL", "");
+
 
 //pref("webgl.disabled",					false);
 pref("webgl.disabled",					true);  //Conflict
@@ -698,21 +702,7 @@ pref("xpinstall.signatures.required",		false);  //Conflict
 //pref("xpinstall.whitelist.add", "");
 //pref("xpinstall.whitelist.add.36", "");
 
-//Various Fixups due to IceCat's compilation defaults
-pref("extensions.blocklist.enabled",			true);
-pref("pfs.filehint.url", "");
-
-// Various Fixups to trim utm, fix http, or unbreak links - May get branded later
-
-pref("app.support.e10sAccessibilityUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/accessibility-ppt");
-pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
-pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION");
-pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes");
-pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
-pref("services.settings.server", "https://icecat.settings.services.mozilla.com/v1");
-
-
+// 
 // Tor Related
 
 pref("font.default.lo", "Noto Sans Lao");