Updating images. Bump version => 2.0.0

15 files changed, 22 insertions, 48 deletions

diff --git a/README.md b/README.md
index 15d80e15..8b71656a 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,10 @@ Send Files => [Send](https://github.com/timvisee/send)
 [![Patreon](./img/patreon.svg)](https://patreon.com/LibRedirect) 
 [![Buy me a coffee](./img/bmc.svg)](https://www.buymeacoffee.com/libredirect)
 
-BTC: bc1qrhue0frps6p2vkg978u9ayethnwprtmfug827q\
+BTC: [bc1qrhue0frps6p2vkg978u9ayethnwprtmfug827q](bitcoin:bc1qrhue0frps6p2vkg978u9ayethnwprtmfug827q)\
 BCH: [qqz5vfnrngk0tjy73q2688qzw4wnllnuzqfndflhl8](bitcoincash:qqz5vfnrngk0tjy73q2688qzw4wnllnuzqfndflhl8)\
-ETH: 0x896E5796Da76E49A400A9186E1c459CD2C64b4E8\
-XMR: 4AM5CVfaGsnEXQQjZSzJvaWufe7pT86ubcZPr83fCjb2Hn3iwcForTWFy2Z3ugXcufUwHaGcucfPMFgPXBFSYGFvNrmV5XR
+ETH: [0x896E5796Da76E49A400A9186E1c459CD2C64b4E8](ethereum:0x896E5796Da76E49A400A9186E1c459CD2C64b4E8)\
+XMR: [4AM5CVfaGsnEXQQjZSzJvaWufe7pT86ubcZPr83fCjb2Hn3iwcForTWFy2Z3ugXcufUwHaGcucfPMFgPXBFSYGFvNrmV5XR](monero:4AM5CVfaGsnEXQQjZSzJvaWufe7pT86ubcZPr83fCjb2Hn3iwcForTWFy2Z3ugXcufUwHaGcucfPMFgPXBFSYGFvNrmV5XR)
 
 [FAQ](https://libredirect.github.io/faq.html)
 
diff --git a/chromium.md b/chromium.md
index 3ef570eb..12c8d2b6 100644
--- a/chromium.md
+++ b/chromium.md
@@ -1,5 +1,5 @@
 ## Linux
-- Download the lastest `.crx` file: [libredirect-1.7.0.crx](https://github.com/libredirect/libredirect/releases/download/v1.7.0/libredirect-1.7.0.crx)
+- Download the lastest `.crx` file: [libredirect-2.0.0.crx](https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.crx)
 - Open `chrome://extensions`
 - Enable `dev mode`
 - Rerfesh the page
@@ -8,11 +8,11 @@
 Updates are automatic
 
 ## Windows, MacOS
-- Download the lastest release [libredirect-1.7.0.zip](https://github.com/libredirect/libredirect/releases/download/v1.7.0/libredirect-1.7.0.zip)
+- Download the lastest release [libredirect-2.0.0.zip](https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.zip)
 - Unzip it with `Auto detect subfolder`
 - Open `chrome://extensions`
 - Enable `dev mode`
-- Click `Load unpacked`. Select and Open `libredirect-1.7.0/`
+- Click `Load unpacked`. Select and Open `libredirect-2.0.0/`
 
 https://user-images.githubusercontent.com/40805353/159987051-8be73cd3-3fdf-4dd0-99d4-8886674fbdb6.mp4
 
diff --git a/img/1.png b/img/1.png
index a730f9a5..1049932d 100644
--- a/img/1.png
+++ b/img/1.png
Binary files differdiff --git a/img/2.png b/img/2.png
index 56bdbd02..329394a4 100644
--- a/img/2.png
+++ b/img/2.png
Binary files differdiff --git a/img/3.png b/img/3.png
index 32b0a61e..c8fdb2ce 100644
--- a/img/3.png
+++ b/img/3.png
Binary files differdiff --git a/img/4.png b/img/4.png
index 73db5a5c..bcda8dde 100644
--- a/img/4.png
+++ b/img/4.png
Binary files differdiff --git a/img/5.png b/img/5.png
index a4cfbcb2..c18c923f 100644
--- a/img/5.png
+++ b/img/5.png
Binary files differdiff --git a/src/assets/images/spotify-icon.png b/src/assets/images/spotify-icon.png
deleted file mode 100644
index 264762a4..00000000
--- a/src/assets/images/spotify-icon.png
+++ /dev/null
Binary files differdiff --git a/src/instances/blocklist.json b/src/instances/blocklist.json
index 43117458..528913ed 100644
--- a/src/instances/blocklist.json
+++ b/src/instances/blocklist.json
@@ -6,12 +6,12 @@
   "https://piped.moomoo.me",
   "https://piped.syncpundit.com",
   "https://piped.mha.fi",
+  "https://piped.shimul.me",
   "https://nhanh.cloud",
   "https://nitter.nixnet.services",
   "https://nitter.domain.glass",
   "https://birdsite.xanny.family",
   "https://nitter.moomoo.me",
-  "https://nitter.it",
   "https://notabird.site",
   "https://fuckthesacklers.network",
   "https://nitter.govt.land",
diff --git a/src/instances/data.json b/src/instances/data.json
index c3d74514..5ad30314 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -12,13 +12,13 @@
       "https://yt.artemislena.eu",
       "https://invidious.flokinet.to",
       "https://invidious.sethforprivacy.com",
-      "https://invidious.mutahar.rocks",
       "https://invidious.tiekoetter.com",
       "https://inv.bp.projectsegfau.lt",
       "https://invidious.lunar.icu",
       "https://invidious.weblibre.org",
       "https://invidious.esmailelbob.xyz",
       "https://youtube.076.ne.jp",
+      "https://invidious.mutahar.rocks",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -280,7 +280,8 @@
       "https://wikiless.lunar.icu",
       "https://wiki.froth.zone",
       "https://wikiless.northboot.xyz",
-      "https://wikiless.tiekoetter.com"
+      "https://wikiless.tiekoetter.com",
+      "https://wikiless.esmailelbob.xyz/"
     ],
     "tor": [
       "http://dj2tbh2nqfxyfmvq33cjmhuw7nb6am7thzd3zsjvizeqf374fixbrxyd.onion",
@@ -366,6 +367,7 @@
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
       "https://search.trom.tf",
+      "https://search.vojkovic.xyz",
       "https://searx.bissisoft.com",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
@@ -392,6 +394,7 @@
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
       "https://searx.theanonymouse.xyz",
+      "https://searx.tiekoetter.com",
       "https://searx.tk",
       "https://searx.tux.land",
       "https://searx.tuxcloud.net",
@@ -435,7 +438,6 @@
       "https://search.privacyguides.net",
       "https://search.rabbit-company.com",
       "https://search.roombob.cat",
-      "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
       "https://searx.albony.xyz",
       "https://searx.bardia.tech",
@@ -451,7 +453,6 @@
       "https://searx.ppeb.me",
       "https://searx.prvcy.eu",
       "https://searx.sev.monster",
-      "https://searx.tiekoetter.com",
       "https://searxng.zackptg5.com",
       "https://swag.pw",
       "https://www.webrats.xyz"
@@ -1021,7 +1022,6 @@
     "https://media.over-world.org",
     "https://tube.avensio.de",
     "https://peertube.klaewyss.fr",
-    "https://video.cpn.so",
     "https://sender-fm.veezee.tube",
     "https://peertube.takeko.cyou",
     "https://tube.chatelet.ovh",
@@ -1077,7 +1077,6 @@
     "https://fair.tube",
     "https://tube.lokad.com",
     "https://videos.benjaminbrady.ie",
-    "https://peertube.bgzashtita.es",
     "https://video.binarydad.com",
     "https://tube.pmj.rocks",
     "https://gary.vger.cloud",
diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py
index b47433ba..b2937d7e 100644
--- a/src/instances/get_instances.py
+++ b/src/instances/get_instances.py
@@ -381,14 +381,14 @@ for k1, v1 in mightyList.items():
     if type(mightyList[k1]) is dict:
         for k2, v2 in mightyList[k1].items():
             for instance in mightyList[k1][k2]:
-                # if (not isValid(instance)):
-                #     del mightyList[k1][k2][instance]
-                #     print("removed " + instance)
-                # else:
-                if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
-                    blocklist.append(instance)
-                if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance):
-                    blocklist.append(instance)
+                if (not isValid(instance)):
+                    mightyList[k1][k2].pop(instance)
+                    print("removed " + instance)
+                else:
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_cloudflare(instance):
+                        blocklist.append(instance)
+                    if not instance.endswith('.onion') and not instance.endswith('.i2p') and is_authenticate(instance):
+                        blocklist.append(instance)
 
 peertube()
 
diff --git a/src/manifest.json b/src/manifest.json
index c0d5621d..c82d6449 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.7.0",
+  "version": "2.0.0",
   "manifest_version": 2,
   "browser_specific_settings": {
     "gecko": {
diff --git a/src/pages/options/init.js b/src/pages/options/init.js
index b9ff4950..c9bf2f00 100644
--- a/src/pages/options/init.js
+++ b/src/pages/options/init.js
@@ -22,7 +22,6 @@ function changeTheme() {
                         document.body.classList.add("dark-theme");
                         document.body.classList.remove("light-theme");
                     }
-
             }
         }
     )
diff --git a/src/pages/options/shared.js b/src/pages/options/shared.js
deleted file mode 100644
index ccc29693..00000000
--- a/src/pages/options/shared.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var autocompletes = [];
-
-function parseURL(urlString) {
-    if (urlString)
-        try {
-            const url = new URL(urlString);
-            if (url.username && url.password)
-                return `${url.protocol}//${url.username}:${url.password}@${url.host}`;
-            else
-                return url.origin;
-
-        } catch (error) {
-            console.log(error);
-            return "";
-        }
-    else
-        return "";
-}
-
-export default {
-    autocompletes,
-    parseURL,
-    autocomplete
-}
\ No newline at end of file
diff --git a/src/updates/updates.xml b/src/updates/updates.xml
index cd0d4ec6..c94edc1a 100644
--- 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/v1.7.0/libredirect-1.7.0.crx' version='1.7.0' />
+        <updatecheck codebase='https://github.com/libredirect/libredirect/releases/download/v2.0.0/libredirect-2.0.0.crx' version='2.0.0' />
     </app>
 </gupdate>