From 768351cfc31546e6e042c7fba8afdc64e74fde10 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Wed, 3 Aug 2022 10:58:22 -0600
Subject: [PATCH] Add sr.ht link to index list view, update instance list

---
 README.md     | 34 +++++++++++++++---------
 index.eex     |  4 +--
 services.json | 73 +++++++++------------------------------------------
 3 files changed, 36 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index c1435c7..e6845b9 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,13 @@
 [![MIT License](https://img.shields.io/github/license/benbusby/earthbound-themes.svg)](http://opensource.org/licenses/MIT)
 [![Elixir CI](https://github.com/benbusby/privacy-revolver/actions/workflows/elixir.yml/badge.svg)](https://github.com/benbusby/privacy-revolver/actions/workflows/elixir.yml)
 
+<table>
+  <tr>
+    <td><a href="https://sr.ht/~benbusby/farside">SourceHut</a></td>
+    <td><a href="https://github.com/benbusby/farside">GitHub</a></td>
+  </tr>
+</table>
+
 </div>
 
 A redirecting service for FOSS alternative frontends.
@@ -35,67 +42,67 @@ For example:
     <tr>
         <td><a href="https://github.com/spikecodes/libreddit">Libreddit</a></td>
         <td>/r/popular</td>
-        <td>https://farside.link/libreddit/r/popular</td>
+        <td><a href="https://farside.link/libreddit/r/popular">https://farside.link/libreddit/r/popular</a></td>
     </tr>
     <tr>
         <td><a href="https://codeberg.org/teddit/teddit">Teddit</a></td>
         <td>/r/popular</td>
-        <td>https://farside.link/teddit/r/popular</td>
+        <td><a href="https://farside.link/teddit/r/popular">https://farside.link/teddit/r/popular</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/zedeus/nitter">Nitter</a></td>
         <td>User Profile</td>
-        <td>https://farside.link/nitter/josevalim</td>
+        <td><a href="https://farside.link/nitter/josevalim">https://farside.link/nitter/josevalim</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/iv-org/invidious">Invidious</a></td>
         <td>Home Page</td>
-        <td>https://farside.link/invidious</td>
+        <td><a href="https://farside.link/invidious">https://farside.link/invidious</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/TeamPiped/Piped">Piped</a></td>
         <td>Video Page</td>
-        <td>https://farside.link/piped/watch?v=eBGIQ7ZuuiU</td>
+        <td><a href="https://farside.link/piped/watch?v=eBGIQ7ZuuiU">https://farside.link/piped/watch?v=eBGIQ7ZuuiU</a></td>
     </tr>
     <tr>
         <td><a href="https://sr.ht/~cadence/bibliogram/">Bibliogram</a></td>
         <td>User Profile</td>
-        <td>https://farside.link/bibliogram/u/kbdfans</td>
+        <td><a href="https://farside.link/bibliogram/u/kbdfans">https://farside.link/bibliogram/u/kbdfans</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/benbusby/whoogle-search">Whoogle</a></td>
         <td>Search "Elixir"</td>
-        <td>https://farside.link/whoogle/search?q=elixir&lang_interface=en</td>
+        <td><a href="https://farside.link/whoogle/search?q=elixir&lang_interface=en">https://farside.link/whoogle/search?q=elixir&lang_interface=en</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/searx/searx">SearX</a></td>
         <td>Search "Redis"</td>
-        <td>https://farside.link/searx/search?q=redis</td>
+        <td><a href="https://farside.link/searx/search?q=redis">https://farside.link/searx/search?q=redis</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/searxng/searxng">SearXNG</a></td>
         <td>Search "EFF"</td>
-        <td>https://farside.link/searxng/search?q=EFF</td>
+        <td><a href="https://farside.link/searxng/search?q=EFF">https://farside.link/searxng/search?q=EFF</a></td>
     </tr>
     <tr>
         <td><a href="https://git.sr.ht/~metalune/simplytranslate_web">SimplyTranslate</a></td>
         <td>Translate "hola"</td>
-        <td>https://farside.link/simplytranslate/?engine=google&text=hola</td>
+        <td><a href="https://farside.link/simplytranslate/?engine=google&text=hola">https://farside.link/simplytranslate/?engine=google&text=hola</a></td>
     </tr>
     <tr>
         <td><a href="https://github.com/TheDavidDelta/lingva-translate">Lingva</a></td>
         <td>Translate "bonjour"</td>
-        <td>https://farside.link/lingva/auto/en/bonjour</td>
+        <td><a href="https://farside.link/lingva/auto/en/bonjour">https://farside.link/lingva/auto/en/bonjour</a></td>
     </tr>
     <tr>
         <td><a href="https://codeberg.org/video-prize-ranch/rimgo">Rimgo</a></td>
         <td>View photo album</td>
-        <td>https://farside.link/rimgo/a/H8M4rcp</td>
+        <td><a href="https://farside.link/rimgo/a/H8M4rcp">https://farside.link/rimgo/a/H8M4rcp</a></td>
     </tr>
     <tr>
         <td><a href="https://sr.ht/~edwardloveall/scribe/">Scribe</a></td>
         <td>View Medium post</td>
-        <td>https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c</td>
+        <td><a href="https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c">https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c</a></td>
     </tr>
 </table>
 
@@ -205,3 +212,4 @@ goes against what Farside is trying to solve. Use at your own discretion.
         <td>The "services" JSON file to use for selecting instances (default: `services.json`)</td>
     </tr>
 </table>
+
diff --git a/index.eex b/index.eex
index 43c19e3..00944ab 100644
--- a/index.eex
+++ b/index.eex
@@ -18,7 +18,7 @@
       border: 1px dashed;
     }
     a:link, a:visited {
-      color: #66397C; 
+      color: #66397C;
     }
     @media only screen and (max-width: 1000px) {
       #child-div {
@@ -33,7 +33,7 @@
 <body>
   <div id="parent-div">
     <div id="child-div">
-      <h1>Farside | <a href="https://github.com/benbusby/farside">View on GitHub</a></h1>
+      <h1>Farside [<a href="https://sr.ht/~benbusby/farside">SourceHut</a>, <a href="https://github.com/benbusby/farside">GitHub</a>]</h1>
       <hr>
       <h3>Last synced <%= last_updated %> UTC</h2>
       <div>
diff --git a/services.json b/services.json
index 3b7e9e7..d982e19 100644
--- a/services.json
+++ b/services.json
@@ -4,18 +4,11 @@
     "test_url": "/r/popular",
     "fallback": "https://libredd.it",
     "instances": [
-      "https://libreddit.albony.xyz",
       "https://libreddit.spike.codes",
       "https://libreddit.dothq.co",
-      "https://libreddit.kavin.rocks",
       "https://libreddit.40two.app",
-      "https://reddit.invak.id",
-      "https://lr.riverside.rocks",
-      "https://libreddit.silkky.cloud",
-      "https://libreddit.database.red",
-      "https://libreddit.exonip.de",
-      "https://libreddit.domain.glass",
-      "https://libreddit.trevorthalacker.com",
+      "https://reddit.phii.me",
+      "https://libreddit.sugoma.tk",
       "https://reddit.artemislena.eu",
       "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
@@ -23,10 +16,8 @@
       "https://libreddit.igna.rocks",
       "https://libreddit.autarkic.org",
       "https://libreddit.flux.industries",
-      "https://libreddit.drivet.xyz",
       "https://libreddit.de",
-      "https://libreddit.bus-hit.me",
-      "https://de.leddit.xyz"
+      "https://libreddit.bus-hit.me"
     ]
   },
   {
@@ -37,18 +28,15 @@
       "https://incogsnoo.com",
       "https://rdt.trom.tf",
       "https://reddit.lol",
+      "https://snoo.ioens.is",
       "https://teddit.adminforge.de",
       "https://teddit.bus-hit.me",
-      "https://teddit.domain.glass",
-      "https://teddit.encrypted-data.xyz",
       "https://teddit.froth.zone",
-      "https://teddit.garudalinux.org",
-      "https://teddit.ggc-project.de",
-      "https://teddit.httpjames.space",
-      "https://teddit.namazso.eu",
+      "https://teddit.nautolan.racing",
       "https://teddit.net",
       "https://teddit.pussthecat.org",
       "https://teddit.sethforprivacy.com",
+      "https://teddit.tinfoil-hat.net",
       "https://teddit.totaldarkness.net",
       "https://teddit.zaggy.nl"
     ]
@@ -58,7 +46,6 @@
     "test_url": "/u/officialrickastley",
     "fallback": "https://bibliogram.art",
     "instances": [
-      "https://bib.actionsack.com",
       "https://bibliogram.1d4.us",
       "https://bibliogram.art",
       "https://bibliogram.froth.zone",
@@ -67,8 +54,6 @@
       "https://bibliogram.pussthecat.org",
       "https://bibliogram.snopyta.org",
       "https://ig.beparanoid.de",
-      "https://ig.funami.tech",
-      "https://ig.tokhmi.xyz",
       "https://insta.trom.tf",
       "https://insta.tromdienste.de"
     ]
@@ -79,13 +64,9 @@
     "fallback": "https://invidious.snopyta.org",
     "instances": [
       "https://inv.bp.projectsegfau.lt",
-      "https://inv.privacy.com.de",
-      "https://inv.riverside.rocks",
       "https://inv.vern.cc",
       "https://invidious.esmailelbob.xyz",
       "https://invidious.flokinet.to",
-      "https://invidious.kavin.rocks",
-      "https://invidious.namazso.eu",
       "https://invidious.nerdvpn.de",
       "https://invidious.osi.kr",
       "https://invidious.projectsegfau.lt",
@@ -106,10 +87,6 @@
     "test_url": "/watch?v=eBGIQ7ZuuiU",
     "fallback": "https://piped.kavin.rocks",
     "instances": [
-      "https://piped.kavin.rocks",
-      "https://piped.silkky.cloud",
-      "https://piped.tokhmi.xyz",
-      "https://piped.moomoo.me",
       "https://piped.mint.lgbt"
     ]
   },
@@ -124,29 +101,21 @@
       "https://nitter.nixnet.services",
       "https://nitter.fdn.fr",
       "https://nitter.1d4.us",
-      "https://nitter.kavin.rocks",
       "https://nitter.vxempire.xyz",
       "https://nitter.unixfox.eu",
       "https://nitter.eu",
-      "https://nitter.namazso.eu",
       "https://nitter.mailstation.de",
-      "https://n.actionsack.com",
       "https://nitter.cattube.org",
-      "https://nitter.exonip.de",
       "https://twitr.gq",
-      "https://nitter.moomoo.me",
       "https://bird.trom.tf",
       "https://nitter.it",
-      "https://twitter.censors.us",
       "https://nitter.grimneko.de",
-      "https://nitter.koyu.space",
       "https://n.0x0.st",
       "https://n.hyperborea.cloud",
       "https://nitter.ca",
       "https://twitter.076.ne.jp",
       "https://nitter.sethforprivacy.com",
       "https://nitter.bus-hit.me",
-      "https://de.nttr.stream",
       "https://n.l5.ca",
       "https://unofficialbird.com"
     ]
@@ -177,10 +146,9 @@
       "https://tl.vern.cc",
       "https://translate.beparanoid.de",
       "https://translate.bus-hit.me",
-      "https://translate.namazso.eu",
+      "https://translate.josias.dev",
       "https://translate.northboot.xyz",
       "https://translate.priv.pw",
-      "https://translate.riverside.rocks",
       "https://translate.slipfox.xyz",
       "https://translate.tiekoetter.com"
     ]
@@ -202,7 +170,6 @@
     "instances": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
-      "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me"
     ]
@@ -213,15 +180,10 @@
     "fallback": "https://whoogle.fossho.st",
     "instances": [
       "https://gowogle.voring.me",
-      "https://s.tokhmi.xyz",
-      "https://search.albony.xyz",
-      "https://search.dr460nf1r3.org",
-      "https://search.garudalinux.org",
       "https://search.sethforprivacy.com",
-      "https://search.wef.lol",
-      "https://whoogle.dcs0.hu",
       "https://whoogle.esmailelbob.xyz",
       "https://whoogle.fossho.st",
+      "https://whoogle.lunar.icu",
       "https://whoogle.privacydev.net",
       "https://www.whooglesearch.ml"
     ]
@@ -235,7 +197,6 @@
       "https://dynabyte.ca",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
-      "https://searx.gnu.style",
       "https://searx.ru",
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
@@ -249,11 +210,11 @@
     "test_url": "/search?q=<%=query%>",
     "fallback": "https://searx.be",
     "instances": [
+      "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://priv.au",
-      "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
@@ -264,12 +225,8 @@
       "https://search.mdosch.de",
       "https://search.neet.works",
       "https://search.ononoki.org",
-      "https://search.privacyguides.net",
       "https://search.projectsegfau.lt",
-      "https://search.rabbit-company.com",
       "https://search.sapti.me",
-      "https://search.teamriverbubbles.com",
-      "https://search.unlocked.link",
       "https://search.zzls.xyz",
       "https://searx.be",
       "https://searx.becomesovran.com",
@@ -279,14 +236,13 @@
       "https://searx.fmac.xyz",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
-      "https://searx.namejeff.xyz",
       "https://searx.priv.pw",
       "https://searx.prvcy.eu",
       "https://searx.sev.monster",
+      "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
-      "https://searx.zcyph.cc",
+      "https://searx.vimproved.me",
       "https://searxng.tordenskjold.de",
-      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -297,11 +253,10 @@
     "test_url": "/wiki/Wikipedia?lang=en",
     "fallback": "https://wikiless.org",
     "instances": [
-      "https://wiki.604kph.xyz",
       "https://wiki.froth.zone",
       "https://wiki.slipfox.xyz",
       "https://wikiless.esmailelbob.xyz",
-      "https://wikiless.funami.tech",
+      "https://wikiless.lunar.icu",
       "https://wikiless.northboot.xyz",
       "https://wikiless.org",
       "https://wikiless.sethforprivacy.com",
@@ -337,9 +292,7 @@
     "fallback": "https://librex.beparanoid.de",
     "instances": [
       "https://librex.beparanoid.de",
-      "https://search.davidovski.xyz",
-      "https://search.funami.tech",
-      "https://librex.catalyst.sx"
+      "https://search.davidovski.xyz"
     ]
   },
   {