Fixed thing in reddit. Fixed bug in incognito, Fixed localise module error. Bump => 2.1.0

ManeraKai · ManeraKai · commit 64014cfdf793 · 2022-06-09T20:29:05.000+03:00
diff --git a/chromium.md b/chromium.md
@@ -1,5 +1,5 @@
 ## Linux
-- Download the latest `.crx` file: [libredirect-2.0.0.crx](https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.crx)
+- Download the latest `.crx` file: [libredirect-2.1.0.crx](https://github.com/libredirect/libredirect/releases/download/v2.1.0/libredirect-2.1.0.crx)
 - Open `chrome://extensions`
 - Enable `dev mode`
 - Rerfesh the page
@@ -8,11 +8,11 @@
 Updates are automatic
 
 ## Windows, MacOS
-- Download the latest release [libredirect-2.0.0.zip](https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.zip)
+- Download the latest release [libredirect-2.1.0.zip](https://github.com/libredirect/libredirect/releases/download/v2.1.0/libredirect-2.1.0.zip)
 - Unzip it with `Auto detect subfolder`
 - Open `chrome://extensions`
 - Enable `dev mode`
-- Click `Load unpacked`. Select and Open `libredirect-2.0.0/`
+- Click `Load unpacked`. Select and Open `libredirect-2.1.0/`
 
 https://user-images.githubusercontent.com/40805353/159987051-8be73cd3-3fdf-4dd0-99d4-8886674fbdb6.mp4
 
diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js
@@ -240,34 +240,34 @@ function redirect(url, type, initiator) {
     if (redditFrontend == 'teddit') {
       if (tedditInstancesList.length === 0) return;
       let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList);
-      return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.reddit}`;
+      return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.search}`;
     }
     if (redditFrontend == 'libreddit') {
       if (libredditInstancesList.length === 0) return;
       let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);
-      return `${libredditRandomInstance}/img${url.pathname}${url.reddit}`
+      return `${libredditRandomInstance}/img${url.pathname}${url.search}`
     }
   }
   else if (url.host === "redd.it") {
     if (redditFrontend == 'libreddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) {
       if (libredditInstancesList.length === 0) return;
       let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);
       // https://redd.it/foo => https://libredd.it/comments/foo
-      return `${libredditRandomInstance}/comments${url.pathname}${url.reddit}`;
+      return `${libredditRandomInstance}/comments${url.pathname}${url.search}`;
     }
     if (redditFrontend == 'teddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) {
       if (tedditInstancesList.length === 0) return;
       let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList);
       // https://redd.it/foo => https://teddit.net/comments/foo
-      return `${tedditRandomInstance}/comments${url.pathname}${url.reddit}`
+      return `${tedditRandomInstance}/comments${url.pathname}${url.search}`
     }
   }
   else if (url.host === 'preview.redd.it') {
     if (redditFrontend == 'teddit') return;
     if (redditFrontend == 'libreddit') {
       if (libredditInstancesList.length === 0) return;
       const libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);
-      return `${libredditRandomInstance}/preview/pre${url.pathname}${url.reddit}`;
+      return `${libredditRandomInstance}/preview/pre${url.pathname}${url.search}`;
     }
   }
 
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
@@ -139,7 +139,7 @@ browser.tabs.onCreated.addListener(
   tab => {
     if (tab.incognito) {
       incognitoList.push(tab.id);
-      if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html") });
+      if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html"), active: false });
     }
   }
 );
diff --git a/src/pages/errors/instance_offline.html b/src/pages/errors/instance_offline.html
@@ -29,14 +29,13 @@
 
 <body>
     <div>
-        <p id="message" data-localise="__MSG_instanceOffline__">This instance is offline, you'll be redirected after&nbsp;<span
-                id="number">2</span>&nbsp;<x data-localise="__MSG_sec__">seconds</x>
+        <p id="message" data-localise="__MSG_instanceOffline__">This instance is offline, you'll be redirected
+            after&nbsp;<span id="number">2</span>&nbsp;<x data-localise="__MSG_sec__">seconds</x>
         </p>
         <button id="cancel" data-localise="__MSG_cancel__">Cancel</button>
     </div>
 
-    <script src="instance_offline.js"></script>
-    <script src="../../assets/javascripts/localise.js"></script>
+    <script src="instance_offline.js" type="module"></script>
 </body>
 
-</html>
+</html>
diff --git a/src/pages/errors/instance_offline.js b/src/pages/errors/instance_offline.js
@@ -1,3 +1,6 @@
+import localise from "../../assets/javascripts/localise.js";
+
+
 const params = new Proxy(
     new URLSearchParams(window.location.search),
     { get: (searchParams, prop) => searchParams.get(prop) }
@@ -18,3 +21,5 @@ document.getElementById("cancel").addEventListener("click", () => {
     isCanceled = true;
     document.getElementById("message").innerHTML = browser.i18n.getMessage('redirectionCanceled');
 })
+
+localise.localisePage();
diff --git a/src/updates/updates.xml b/src/updates/updates.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
     <app appid='oladmjdebphlnjjcnomfhhbfdldiimaf'>
-        <updatecheck codebase='https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.crx' version='2.0.0' />
+        <updatecheck codebase='https://github.com/libredirect/libredirect/releases/download/v2.1.0/libredirect-2.1.0.crx' version='2.1.0' />
     </app>
 </gupdate>

Original file line number	Diff line number	Diff line change
`@@ -240,34 +240,34 @@ function redirect(url, type, initiator) {`
`240`	`240`	`if (redditFrontend == 'teddit') {`
`241`	`241`	`if (tedditInstancesList.length === 0) return;`
`242`	`242`	`let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList);`
`243`		- return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.reddit}`;
	`243`	+ return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.search}`;
`244`	`244`	`}`
`245`	`245`	`if (redditFrontend == 'libreddit') {`
`246`	`246`	`if (libredditInstancesList.length === 0) return;`
`247`	`247`	`let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);`
`248`		- return `${libredditRandomInstance}/img${url.pathname}${url.reddit}`
	`248`	+ return `${libredditRandomInstance}/img${url.pathname}${url.search}`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`	`else if (url.host === "redd.it") {`
`252`	`252`	`if (redditFrontend == 'libreddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) {`
`253`	`253`	`if (libredditInstancesList.length === 0) return;`
`254`	`254`	`let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);`
`255`	`255`	`// https://redd.it/foo => https://libredd.it/comments/foo`
`256`		- return `${libredditRandomInstance}/comments${url.pathname}${url.reddit}`;
	`256`	+ return `${libredditRandomInstance}/comments${url.pathname}${url.search}`;
`257`	`257`	`}`
`258`	`258`	`if (redditFrontend == 'teddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) {`
`259`	`259`	`if (tedditInstancesList.length === 0) return;`
`260`	`260`	`let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList);`
`261`	`261`	`// https://redd.it/foo => https://teddit.net/comments/foo`
`262`		- return `${tedditRandomInstance}/comments${url.pathname}${url.reddit}`
	`262`	+ return `${tedditRandomInstance}/comments${url.pathname}${url.search}`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`	`else if (url.host === 'preview.redd.it') {`
`266`	`266`	`if (redditFrontend == 'teddit') return;`
`267`	`267`	`if (redditFrontend == 'libreddit') {`
`268`	`268`	`if (libredditInstancesList.length === 0) return;`
`269`	`269`	`const libredditRandomInstance = utils.getRandomInstance(libredditInstancesList);`
`270`		- return `${libredditRandomInstance}/preview/pre${url.pathname}${url.reddit}`;
	`270`	+ return `${libredditRandomInstance}/preview/pre${url.pathname}${url.search}`;
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ browser.tabs.onCreated.addListener(`
`139`	`139`	`tab => {`
`140`	`140`	`if (tab.incognito) {`
`141`	`141`	`incognitoList.push(tab.id);`
`142`		`- if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html") });`
	`142`	`+ if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html"), active: false });`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`);`