From 398b122ec66a729a19446816a131ecc72fa46905 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Thu, 21 Oct 2021 20:37:28 +0300
Subject: Added Change Instance btn to address-bar

---
 src/manifest.json | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'src/manifest.json')

diff --git a/src/manifest.json b/src/manifest.json
index 9a2031f5..25b37e1c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -14,7 +14,24 @@
     "48": "assets/images/icon48.png",
     "128": "assets/images/icon128.png"
   },
-  "permissions": ["storage", "webRequest", "webRequestBlocking", "<all_urls>"],
+  "permissions": [
+    "storage",
+    "webRequest",
+    "webRequestBlocking",
+    "<all_urls>"
+  ],
+  "page_action": {
+    "show_matches": [
+      "<all_urls>"
+    ],
+    "default_title": "Change Instance",
+    "default_icon": {
+      "16": "assets/images/icon16.png",
+      "32": "assets/images/icon32.png",
+      "48": "assets/images/icon48.png",
+      "128": "assets/images/icon128.png"
+    }
+  },
   "browser_action": {
     "default_title": "Privacy Redirect",
     "default_popup": "pages/popup/popup.html",
@@ -34,7 +51,9 @@
         "*://pbs.twimg.com/*",
         "*://video.twimg.com/*"
       ],
-      "js": ["assets/javascripts/remove-twitter-sw.js"],
+      "js": [
+        "assets/javascripts/remove-twitter-sw.js"
+      ],
       "run_at": "document_start"
     },
     {
@@ -63,7 +82,9 @@
         "*://c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid.onion/*",
         "*://w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd.onion/*"
       ],
-      "js": ["assets/javascripts/persist-invidious-prefs.js"],
+      "js": [
+        "assets/javascripts/persist-invidious-prefs.js"
+      ],
       "run_at": "document_start"
     }
   ],
@@ -71,11 +92,13 @@
     "page": "pages/options/options.html",
     "open_in_tab": false
   },
-  "web_accessible_resources": ["assets/javascripts/helpers/*"],
+  "web_accessible_resources": [
+    "assets/javascripts/helpers/*"
+  ],
   "browser_specific_settings": {
     "gecko": {
       "id": "{b7f9d2cd-d772-4302-8c3f-eb941af36f76}",
       "strict_min_version": "67.0"
     }
   }
-}
+}
\ No newline at end of file
-- 
cgit 1.4.1


From 97d3d19b7d65720f6d1677d31fe1ce670ac63580 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Wed, 27 Oct 2021 10:18:05 +0300
Subject: Preserved url's path. Only the domain will change now.

---
 src/manifest.json                  |  1 +
 src/pages/background/background.js | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'src/manifest.json')

diff --git a/src/manifest.json b/src/manifest.json
index 25b37e1c..83557cfe 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -15,6 +15,7 @@
     "128": "assets/images/icon128.png"
   },
   "permissions": [
+    "tabs",
     "storage",
     "webRequest",
     "webRequestBlocking",
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index ec8ae576..9829feb7 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -688,12 +688,19 @@ browser.runtime.onInstalled.addListener((details) => {
 });
 
 
-function openPage() {
-  if (oldDomain != '') {
-    browser.tabs.update({
-      url: oldDomain
-    });
-  }
+function changeInstance() {
+  browser.tabs.query({
+    active: true,
+    lastFocusedWindow: true
+  }, function (tabs) {
+    var tabUrl = new URL(tabs[0].url);
 
+    if (oldDomain != '') {
+      browser.tabs.update({
+        url: tabUrl.href.replace(`${tabUrl.protocol}//${tabUrl.host}/`, oldDomain)
+      });
+    }
+  });
 }
-browser.pageAction.onClicked.addListener(openPage);
\ No newline at end of file
+
+browser.pageAction.onClicked.addListener(changeInstance);
\ No newline at end of file
-- 
cgit 1.4.1