Merge branch 'master' of https://github.com/libredirect/libredirect

src/assets/javascripts/youtubeMusic.js

@@ -65,6 +65,11 @@ https://music.youtube.com/playlist?list=OLAK5uy_nBOTxAc3_RGB82-Z54jdARGxGaCYlpng
 https://beatbump.ml/release?id=MPREb_QygdC0wEoLe
 
 https://music.youtube.com/watch?v=R6gSMSYKhKU&list=OLAK5uy_n-9HVh3cryV2gREZM9Sc0JwEKYjjfi0dU
+
+Search
+https://music.youtube.com/search?q=test
+https://beatbump.ml/search/test?filter=EgWKAQIIAWoKEAMQBBAKEAkQBQ%3D%3D
+
 */
 function redirect(url, disableOverride) {
     if (disableYoutubeMusic && !disableOverride) return;
@@ -76,7 +81,8 @@ function redirect(url, disableOverride) {
     return `${randomInstance}${url.pathname}${url.search}`
         .replace("/watch?v=", "/listen?id=")
         .replace("/channel/", "/artist/")
-        .replace("/playlist?list=", "/playlist/VL");
+        .replace("/playlist?list=", "/playlist/VL")
+        .replace(/\/search\?q=.*/, searchQuery => searchQuery.replace("?q=", "/") + "?filter=EgWKAQIIAWoKEAMQBBAKEAkQBQ%3D%3D");
 }
 
 async function initDefaults() {

src/instances/blacklist.json

@@ -36,10 +36,10 @@
     "https://wiki.604kph.xyz",
     "https://wikiless.lunar.icu",
     "https://lingva.lunar.icu",
+    "https://searx.albony.xyz",
     "https://searx.josie.lol",
     "https://searx.org",
     "https://searx.run",
-    "https://searx.albony.xyz",
     "https://search.albony.xyz",
     "https://search.garudalinux.org",
     "https://search.dr460nf1r3.org",

src/instances/data.json

@@ -64,12 +64,12 @@
       "https://send.ephemeral.land",
       "https://send.mni.li",
       "https://send.monks.tools",
-      "https://send.jeugdhulp.be",
       "https://send.aurorabilisim.com",
       "https://nhanh.cloud",
       "https://send.datahoarder.dev",
       "https://fileupload.ggc-project.de",
       "https://drop.chapril.org",
+      "https://send.jeugdhulp.be",
       "https://files.psu.ru",
       "https://send.portailpro.net",
       "https://bytefile.de",
@@ -280,8 +280,9 @@
       "https://teddit.adminforge.de",
       "https://teddit.bus-hit.me",
       "https://teddit.froth.zone",
-      "https://trom.tf/",
-      "https://teddit.encrypted-data.xyz"
+      "https://rdt.trom.tf/",
+      "https://teddit.encrypted-data.xyz",
+      "https://i.opnxng.com"
     ],
     "tor": [
       "http://snoo.ioensistjs7wd746zluwixvojbbkxhr37lepdvwtdfeav673o64iflqd.onion",
@@ -330,14 +331,17 @@
     "normal": [
       "https://quetre.herokuapp.com",
       "https://quora.vern.cc",
-      "https://quetre.pussthecat.org"
+      "https://quetre.pussthecat.org",
+      "https://wuetre.herokuapp.com",
+      "https://quetreus.herokuapp.com"
     ],
     "tor": []
   },
   "libremdb": {
     "normal": [
       "https://libremdb.herokuapp.com",
-      "https://libremdb.pussthecat.org"
+      "https://libremdb.pussthecat.org",
+      "https://libremdbeu.herokuapp.com"
     ],
     "tor": []
   },
@@ -381,11 +385,10 @@
       "http://z34ambyi6makk6ta7ksog2sljly2ctt2sa3apekb7wkllk72sxecdtad.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
-      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
       "http://f4qfqajszpx5b7itzxt6mb7kj4ktpgbdq7lq6xaiqyqx6a7de3epptad.onion",
+      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
       "http://rq2w52kyrif3xpfihkgjnhqm3a5aqhoikpv72z3drpjglfzc2wr5z4yd.onion",
-      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion",
       "http://searx.bsbvtqi5oq2cqzn32zt4cr2f2z2rwots3dq7gmdcnlyqoxko2wx6reqd.onion"
     ],
     "i2p": [
@@ -398,12 +401,13 @@
       "https://jsearch.pw",
       "https://nibblehole.com",
       "https://search.antonkling.se",
-      "https://search.disroot.org",
       "https://search.ethibox.fr",
       "https://search.jpope.org",
+      "https://search.roombob.cat",
       "https://search.snopyta.org",
       "https://search.stinpriza.org",
       "https://search.trom.tf",
+      "https://searx.albony.xyz",
       "https://searx.bissisoft.com",
       "https://searx.divided-by-zero.eu",
       "https://searx.dresden.network",
@@ -447,10 +451,12 @@
     "tor": [
       "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
+      "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
-      "http://searx.micohauwkjbyw5meacrb4ipicwvwg4xtzl7y7viv53kig2mdcsvwkyyd.onion",
-      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion"
+      "http://searxdr3pqz4nydgnqocsia2xbywptxbkympa2emn7zlgggrir4bkfad.onion",
+      "http://searx.privpw3tndpkw6pnp3g727zfgfdzbu3k6a7chv226s3xymv2p4eiuqyd.onion",
+      "http://searx3aolosaf3urwnhpynlhuokqsgz47si4pzz5hvb7uuzyjncl2tid.onion"
     ],
     "i2p": [],
     "normal": [
@@ -462,20 +468,21 @@
       "https://paulgo.io",
       "https://procurx.pt",
       "https://s.zhaocloud.net",
+      "https://search.ashs.club",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
+      "https://search.disroot.org",
       "https://search.mdosch.de",
       "https://search.neet.works",
       "https://search.ononoki.org",
       "https://search.privacyguides.net",
       "https://search.rabbit-company.com",
-      "https://search.roombob.cat",
       "https://search.sapti.me",
       "https://search.vojkovic.xyz",
       "https://search.zzls.xyz",
-      "https://searx.albony.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
+      "https://searx.chocoflan.net",
       "https://searx.ebnar.xyz",
       "https://searx.ericaftereric.top",
       "https://searx.esmailelbob.xyz",
@@ -483,6 +490,7 @@
       "https://searx.gnous.eu",
       "https://searx.loafland.xyz",
       "https://searx.mha.fi",
+      "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
       "https://searx.orion-hub.fr",
       "https://searx.ppeb.me",
@@ -523,7 +531,6 @@
     "normal": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
-      "https://img.riverside.rocks",
       "https://rimgo.bus-hit.me",
       "https://rimgo.esmailelbob.xyz",
       "https://rimgo.lunar.icu",
@@ -533,16 +540,15 @@
       "https://rimgo.vern.cc"
     ],
     "tor": [
-      "http://jx3dpcwedpzu2mh54obk5gvl64i2ln7pt5mrzd75s4jnndkqwzaim7ad.onion",
       "http://rimgo.lqs5fjmajyp7rvp4qvyubwofzi6d4imua7vs237rkc4m5qogitqwrgyd.onion",
-      "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion",
-      "http://be7udfhmnzqyt7cxysg6c4pbawarvaofjjywp35nhd5qamewdfxl6sid.onion"
+      "http://rimgo.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"
     ],
-    "i2p": [
-      "http://xazdnfgtzmcbcxhmcbbvr4uodd6jtn4fdiayasghywdn227xsmoa.b32.i2p"
-    ]
+    "i2p": []
   },
   "peertube": [
+    "https://videos.cassidypunchmachine.com",
+    "https://video.mullet.social",
+    "https://tv1.gomntu.space",
     "https://peervideo.top",
     "https://dalek.zone",
     "https://shiotube.f5.si",
@@ -584,7 +590,6 @@
     "https://video.lunasqu.ee",
     "https://bundang.tube.jeena.net",
     "https://ptube.ranranhome.info",
-    "https://peertube.otakufarms.com",
     "https://v.mkp.ca",
     "https://tru.vi",
     "https://share.peertube.support",
@@ -612,7 +617,6 @@
     "https://acts17archive.org",
     "https://video.9wd.eu",
     "https://video.niboe.info",
-    "https://tube.zee.li",
     "https://peertuibe.fedsinfo.nohost.me",
     "https://s9.gegenstimme.tv",
     "https://peertube.parleur.net",
@@ -650,7 +654,6 @@
     "https://peertube.io",
     "https://peertube.echelon4.space",
     "https://www.kotikoff.net",
-    "https://manicphase.me",
     "https://peertube.nz",
     "https://camp.ashlande.rs",
     "https://videos.grafo.zone",
@@ -783,13 +786,11 @@
     "https://videos.yeswiki.net",
     "https://tube.lrk.sh",
     "https://peertube.teneriffe.nohost.me",
-    "https://peertube.rainynight.city",
     "https://peertube.magnox.me",
     "https://peertube.autogestioncitoyenne.org",
     "https://stream.dynacloud.ynh.fr",
     "https://video.r3s.nrw",
     "https://peertube.semweb.pro",
-    "https://aktivtube.com",
     "https://sneedtube.com",
     "https://poast.tv",
     "https://testube.distrilab.fr",
@@ -1146,7 +1147,6 @@
     "https://a.metube.ch",
     "https://peertube.luckow.org",
     "https://video.linuxtrent.it",
-    "https://video.demokratischer-sommer.de",
     "https://tube.bachaner.fr",
     "https://video.comune.trento.it",
     "https://peertube.red",
@@ -1277,7 +1277,6 @@
     "https://peertube.dc.pini.fr",
     "https://peertube.simounet.net",
     "https://peertube.bilange.ca",
-    "https://befree.nohost.me",
     "https://watch.ignorance.eu",
     "https://tube.schleuss.online",
     "https://tube-corse.beta.education.fr",
@@ -1587,6 +1586,10 @@
     "https://tube.homecomputing.fr",
     "https://video.tedomum.net",
     "https://video.g3l.org",
-    "https://fontube.fr"
+    "https://fontube.fr",
+    "https://peertube.gaialabs.ch",
+    "https://peertube.qtg.fr",
+    "https://tube.p2p.legal",
+    "https://troll.tv"
   ]
 }