Fix conflicts

3 files changed, 48 insertions, 17 deletions

diff --git a/src/instances/blacklist.json b/src/instances/blacklist.json
index 5819fb7d..54b7fe0b 100644
--- a/src/instances/blacklist.json
+++ b/src/instances/blacklist.json
@@ -8,9 +8,12 @@
     "https://piped.mha.fi",
     "https://piped.shimul.me",
     "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
     "https://nitter.domain.glass",
     "https://birdsite.xanny.family",
     "https://nitter.moomoo.me",
+    "https://nitter.it",
     "https://notabird.site",
     "https://fuckthesacklers.network",
     "https://nitter.winscloud.net",
diff --git a/src/instances/data.json b/src/instances/data.json
index a532260f..b74d0622 100644
--- a/src/instances/data.json
+++ b/src/instances/data.json
@@ -16,10 +16,11 @@
       "https://invidious.projectsegfau.lt",
       "https://inv.vern.cc",
       "https://invidious.nerdvpn.de",
+      "https://inv.privacy.com.de",
       "https://invidious.slipfox.xyz",
+      "https://invidious.weblibre.org",
       "https://youtube.076.ne.jp",
       "https://invidious.esmailelbob.xyz",
-      "https://invidious.weblibre.org",
       "https://invidious.namazso.eu"
     ],
     "tor": [
@@ -46,10 +47,13 @@
       "https://piped.mha.fi",
       "https://piped.shimul.me",
       "https://pipedus.palash.dev",
+      "https://piped.waffle.wiki",
+      "https://watch.whatever.social",
       "https://yt.jae.fi",
       "https://piped.mint.lgbt",
       "https://piped.privacy.com.de",
-      "https://piped.esmailelbob.xyz"
+      "https://piped.esmailelbob.xyz",
+      "https://piped.projectsegfau.lt"
     ],
     "tor": [
       "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
@@ -391,7 +395,8 @@
       "https://wuetre.herokuapp.com",
       "https://quetreus.herokuapp.com",
       "https://quetre.tokhmi.xyz",
-      "https://quetre.projectsegfau.lt"
+      "https://quetre.projectsegfau.lt",
+      "https://quetre.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -402,7 +407,8 @@
       "https://libremdb.herokuapp.com",
       "https://libremdb.pussthecat.org",
       "https://libremdbeu.herokuapp.com",
-      "https://lmdb.tokhmi.xyz"
+      "https://lmdb.tokhmi.xyz",
+      "https://libremdb.esmailelbob.xyz"
     ],
     "tor": [],
     "i2p": [],
@@ -472,6 +478,7 @@
       "https://searx.netzspielplatz.de",
       "https://searx.nixnet.services",
       "https://searx.org",
+      "https://searx.priv.pw",
       "https://searx.pwoss.org",
       "https://searx.rasp.fr",
       "https://searx.ru",
@@ -496,7 +503,6 @@
     ],
     "tor": [
       "http://3afisqjw2rxm6z7mmstyt5rx75qfqrgxnkzftknbp2vhipr2nrmrjdyd.onion",
-      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://yra4tke2pwcnatxjkufpw6kvebu3h3ti2jca2lcdpgx3mpwol326lzid.onion",
       "http://z5vawdol25vrmorm4yydmohsd4u6rdoj2sylvoi3e3nqvxkvpqul7bqd.onion",
       "http://zbuc3bbzbfdqqo2x46repx2ddajbha6fpsjeeptjhhhhzji3zopxdqyd.onion",
@@ -519,10 +525,10 @@
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
-      "https://private-searx.ml",
       "https://privatus.live",
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
+      "https://saber.tk",
       "https://search.affusio.com",
       "https://search.ashs.club",
       "https://search.bingowaves.xyz",
@@ -551,12 +557,10 @@
       "https://searx.fi",
       "https://searx.fmac.xyz",
       "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.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.rimkus.it",
       "https://searx.sethforprivacy.com",
@@ -577,8 +581,8 @@
       "https://xcxc.ml"
     ],
     "tor": [
+      "http://w5rl6wsd7mzj4bdkbuqvzidet5osdsm5jhg2f7nvfidakfq5exda5wid.onion",
       "http://4n53nafyi77iplnbrpmxnp3x4exbswwxigujaxy3b37fvr7bvlopxeyd.onion",
-      "http://x5gdjh6t7kb4yubpufhtc3l3df2acev3emxdasd5vyuyoon5rzf5zkyd.onion",
       "http://search3q76rqpektbrchlf2rjq4fnbxzeov6rljdywg3nwbunpgd7bid.onion",
       "http://searchoorwalty5a2ailrboa2asqyts2u7bdoqwnjefpgjobpvtzn4qd.onion",
       "http://gbat2pbpg7ys3fi3pbp64667tt5x66mg45xok35bxdw7v55brm7a27yd.onion",
@@ -668,6 +672,7 @@
     "loki": []
   },
   "peertube": [
+    "https://soberania.tv",
     "https://pire.artisanlogiciel.net",
     "https://trutube.xyz",
     "https://tube-test.apps.education.fr",
@@ -1022,7 +1027,6 @@
     "https://peertube.marud.fr",
     "https://freetubehub.live",
     "https://peertube.librelabucm.org",
-    "https://tube4.apolut.net",
     "https://mtube.mooo.com",
     "https://skeptube.fr",
     "https://tube.villejuif.fr",
@@ -1039,7 +1043,6 @@
     "https://open.movie",
     "https://tube.rfc1149.net",
     "https://tube.radiomercure.fr",
-    "https://medias.debrouillonet.org",
     "https://peertube.1984.cz",
     "https://tube.sp4ke.com",
     "https://pt.nix.uno",
@@ -1071,7 +1074,6 @@
     "https://dud-video.inf.tu-dresden.de",
     "https://media-test.interior.edu.uy",
     "https://media.interior.edu.uy",
-    "https://peertube.la-scic.fr",
     "https://phoenixproject.group",
     "https://peertube.sebu77.com",
     "https://www.orion-hub.fr",
@@ -1129,7 +1131,6 @@
     "https://tube.geekyboo.net",
     "https://notretube.asselma.eu",
     "https://canal.facil.services",
-    "https://ukva.li",
     "https://pt.gordons.gen.nz",
     "https://tube.misterbanal.net",
     "https://peertube.fomin.site",
@@ -1225,7 +1226,6 @@
     "https://kino.kompot.si",
     "https://tube.kockatoo.org",
     "https://peertube.cabaal.net",
-    "https://sovran.video",
     "https://stream.k-prod.fr",
     "https://tube.tylerdavis.xyz",
     "https://video.marcorennmaus.de",
@@ -1440,7 +1440,6 @@
     "https://peertube.tspu.edu.ru",
     "https://p.lu",
     "https://serv3.wiki-tube.de",
-    "https://serv1.wiki-tube.de",
     "https://video.lavolte.net",
     "https://peertube.public.cat",
     "https://peertube.anduin.net",
@@ -1508,7 +1507,6 @@
     "https://video.pony.gallery",
     "https://tube.skrep.in",
     "https://tube.others.social",
-    "https://videos.ubuntu-paris.org",
     "https://tube-poitiers.beta.education.fr",
     "https://vid.wildeboer.net",
     "https://battlepenguin.video",
@@ -1712,6 +1710,12 @@
     "https://peertube.qtg.fr",
     "https://tube.p2p.legal",
     "https://troll.tv",
-    "https://videos.iut-orsay.fr"
+    "https://videos.iut-orsay.fr",
+    "https://peertube.solidev.net",
+    "https://videos.cemea.org",
+    "https://video.passageenseine.fr",
+    "https://peertube.touhoppai.moe",
+    "https://share.tube",
+    "https://peertube.heraut.eu"
   ]
 }
\ No newline at end of file
diff --git a/src/instances/piped.json b/src/instances/piped.json
new file mode 100644
index 00000000..5076091d
--- /dev/null
+++ b/src/instances/piped.json
@@ -0,0 +1,24 @@
+{
+  "normal": [
+    "https://piped.kavin.rocks",
+    "https://piped.tokhmi.xyz",
+    "https://piped.moomoo.me",
+    "https://il.ax",
+    "https://piped.syncpundit.com",
+    "https://piped.mha.fi",
+    "https://piped.shimul.me",
+    "https://pipedus.palash.dev",
+    "https://piped.waffle.wiki",
+    "https://watch.whatever.social",
+    "https://yt.jae.fi",
+    "https://piped.mint.lgbt",
+    "https://piped.privacy.com.de",
+    "https://piped.esmailelbob.xyz",
+    "https://piped.projectsegfau.lt/"
+  ],
+  "tor": [
+    "http://piped2bbch4xslbl2ckr6k62q56kon56ffowxaqzy42ai22a4sash3ad.onion"
+  ],
+  "i2p": [],
+  "loki": []
+}
\ No newline at end of file