From e611375e7512fd064e33885f79b70135d2762ea3 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Thu, 28 Jul 2022 09:19:25 -0600
Subject: [PATCH 01/22] Force remove cf filter output in auto update workflow

---
 .github/workflows/update-instances.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 315465a..3eec4a9 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -28,7 +28,7 @@ jobs:
         }
 
         function remove_cf_instances() {
-          rm out.json
+          rm -f out.json
           file="services-full.json"
 
           while read -r line; do
@@ -49,7 +49,7 @@ jobs:
           sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
 
           cat out.json | jq --indent 2 . > services.json
-          rm out.json
+          rm -f out.json
         }
 
         # ==============================================================

From 11b8e8466a9f48ee408d8a34608d8ba334de3065 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Thu, 28 Jul 2022 09:45:01 -0600
Subject: [PATCH 02/22] Remove dead/broken nitter instances

---
 services-full.json | 5 +----
 services.json      | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/services-full.json b/services-full.json
index 69cca5b..ab4a289 100644
--- a/services-full.json
+++ b/services-full.json
@@ -132,13 +132,11 @@
       "https://nitter.kavin.rocks",
       "https://nitter.vxempire.xyz",
       "https://nitter.unixfox.eu",
-      "https://nitter.domain.glass",
       "https://nitter.eu",
       "https://nitter.namazso.eu",
       "https://nitter.mailstation.de",
-      "https://nitter.actionsack.com",
+      "https://n.actionsack.com",
       "https://nitter.cattube.org",
-      "https://birdsite.xanny.family",
       "https://nitter.hu",
       "https://nitter.exonip.de",
       "https://twitr.gq",
@@ -149,7 +147,6 @@
       "https://nitter.grimneko.de",
       "https://nitter.koyu.space",
       "https://nitter.ir",
-      "https://nitter.autarkic.org",
       "https://n.0x0.st",
       "https://n.hyperborea.cloud",
       "https://nitter.ca",
diff --git a/services.json b/services.json
index 827a61a..ed5c520 100644
--- a/services.json
+++ b/services.json
@@ -103,8 +103,8 @@
       "https://nitter.cattube.org",
       "https://twitr.gq",
       "https://bird.trom.tf",
+      "https://nitter.it",
       "https://nitter.grimneko.de",
-      "https://nitter.autarkic.org",
       "https://n.0x0.st",
       "https://n.hyperborea.cloud",
       "https://nitter.ca",
@@ -233,6 +233,7 @@
       "https://searx.sev.monster",
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
+      "https://searx.vimproved.me",
       "https://searx.youshitsune.me",
       "https://searxng.tordenskjold.de",
       "https://serx.ml",

From 431ea613d19fc471de14629dc5dcc7fd22cfbddd Mon Sep 17 00:00:00 2001
From: alvv-z <77728785+alvv-z@users.noreply.github.com>
Date: Sun, 31 Jul 2022 17:05:48 +0000
Subject: [PATCH 03/22] Fix spelling of quetre (#55)

---
 lib/farside.ex     | 4 ++--
 services-full.json | 2 +-
 services.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/farside.ex b/lib/farside.ex
index 6e6e7e6..8159e82 100644
--- a/lib/farside.ex
+++ b/lib/farside.ex
@@ -17,7 +17,7 @@ defmodule Farside do
   @gtranslate_regex ~r/translate.google.com|lingva/
   @tiktok_regex ~r/tiktok.com|proxitok/
   @imdb_regex ~r/imdb.com|libremdb/
-  @quora_regex ~r/quora.com|querte/
+  @quora_regex ~r/quora.com|quetre/
 
   @parent_services %{
     @youtube_regex => ["invidious", "piped"],
@@ -31,7 +31,7 @@ defmodule Farside do
     @gtranslate_regex => ["lingva"],
     @tiktok_regex => ["proxitok"],
     @imdb_regex => ["libremdb"],
-    @quora_regex => ["querte"]
+    @quora_regex => ["quetre"]
   }
 
   def get_services_map do
diff --git a/services-full.json b/services-full.json
index ab4a289..80b3440 100644
--- a/services-full.json
+++ b/services-full.json
@@ -362,7 +362,7 @@
     ]
   },
   {
-    "type": "querte",
+    "type": "quetre",
     "test_url": "/How-does-the-Z-boson-decay",
     "fallback": "https://quetre.herokuapp.com",
     "instances": [
diff --git a/services.json b/services.json
index ed5c520..6bf1a45 100644
--- a/services.json
+++ b/services.json
@@ -289,7 +289,7 @@
     ]
   },
   {
-    "type": "querte",
+    "type": "quetre",
     "test_url": "/How-does-the-Z-boson-decay",
     "fallback": "https://quetre.herokuapp.com",
     "instances": [

From 3460986481b11cbd212c0504db49d9684ea9eeeb Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Sun, 31 Jul 2022 11:47:28 -0600
Subject: [PATCH 04/22] Handle dig return code 9 in update workflow

If dig returns exit code 9 (no reply from server) when checking an
instance for cloudflare records, it shouldn't fail the CI build but
rather just skip adding the instance to the non-cloudflare services
list.

This should be re-evaluated soon to see if the CI build routinely has
issues with getting a server reply. If so, a different approach needs to
be taken to check if an instance is using cloudflare.
---
 .github/workflows/update-instances.yml | 20 +++++++++++---------
 tools/un-cloudflare.sh                 |  7 ++++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 3eec4a9..c77c551 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -32,17 +32,19 @@ jobs:
           file="services-full.json"
 
           while read -r line; do
-              if [[ "$line" == "\"https://"* ]]; then
-                  domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//")
-                  ns=$(dig ns "$domain")
-                  if [[ "$ns" == *"cloudflare"* ]]; then
-                      echo "\"$domain\" using cloudflare, skipping..."
-                  else
-                      echo "$line" >> out.json
-                  fi
+            if [[ "$line" == "\"https://"* ]]; then
+              domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//")
+              ns=$(dig ns "$domain" || true)
+              if [[ "$ns" == *"cloudflare"* ]]; then
+                echo "\"$domain\" using cloudflare, skipping..."
+              elif [ ${#ns} -eq 0 ]; then
+                echo "Unable to verify records for \"$domain\", skipping..."
               else
-                  echo "$line" >> out.json
+                echo "$line" >> out.json
               fi
+            else
+              echo "$line" >> out.json
+            fi
           done <$file
 
           # Remove any trailing commas from new instance lists
diff --git a/tools/un-cloudflare.sh b/tools/un-cloudflare.sh
index 690dd73..b10178b 100755
--- a/tools/un-cloudflare.sh
+++ b/tools/un-cloudflare.sh
@@ -7,9 +7,11 @@ file="services-full.json"
 while read -r line; do
     if [[ "$line" == "\"https://"* ]]; then
         domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//")
-        ns=$(dig ns "$domain")
+        ns=$(dig ns "$domain" || true)
         if [[ "$ns" == *"cloudflare"* ]]; then
             echo "\"$domain\" using cloudflare, skipping..."
+        elif [ ${#ns} -eq 0 ]; then
+            echo "Unable to verify records for \"$domain\", skipping..."
         else
             echo "$line" >> out.json
         fi
@@ -22,5 +24,4 @@ done <$file
 sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
 
 cat out.json | jq --indent 2 . > services.json
-rm out.json
-
+rm -f out.json

From 3c776d55b0cab56f94cb02c1284b945fc3ba8e45 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Mon, 1 Aug 2022 12:04:53 -0600
Subject: [PATCH 05/22] Auto update bibliogram instances w/ instance api

Closes #57
---
 .github/workflows/update-instances.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index c77c551..69dcea4 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -48,7 +48,7 @@ jobs:
           done <$file
 
           # Remove any trailing commas from new instance lists
-          sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
+          sed -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
 
           cat out.json | jq --indent 2 . > services.json
           rm -f out.json
@@ -62,6 +62,22 @@ jobs:
         git remote set-url origin git@github.com:benbusby/farside.git
         git checkout main
 
+        # ==============================================================
+        # Bibliogram update
+        # ==============================================================
+        curl -s https://bibliogram.art/api/instances | \
+          jq '[
+            .data |
+            .[] |
+            select(.onion_site | not) |
+            .address
+          ] | sort' > bibliogram-tmp.json
+        jq --slurpfile bibliogram bibliogram-tmp.json \
+          '( .[] | select(.type == "bibliogram") )
+          .instances |= $bibliogram[0]' services-full.json > services-tmp.json
+
+        apply_update
+
         # ==============================================================
         # searx update
         # ==============================================================

From 0749d012062fef9fd2d8ffeed32c7ac041ad8323 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Mon, 1 Aug 2022 22:20:51 -0600
Subject: [PATCH 06/22] Add missing flag for sed replacement in update workflow

---
 .github/workflows/update-instances.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 69dcea4..197b973 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -48,7 +48,7 @@ jobs:
           done <$file
 
           # Remove any trailing commas from new instance lists
-          sed -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
+          sed -i -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
 
           cat out.json | jq --indent 2 . > services.json
           rm -f out.json

From 6bfc92fb58e1f321b80703e70c28eafe9e33dff9 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 04:24:46 +0000
Subject: [PATCH 07/22] [CI] Auto update instances

---
 services-full.json | 29 ++++++++++------
 services.json      | 86 ++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/services-full.json b/services-full.json
index 80b3440..1b735ce 100644
--- a/services-full.json
+++ b/services-full.json
@@ -69,13 +69,19 @@
     "test_url": "/u/officialrickastley",
     "fallback": "https://bibliogram.art",
     "instances": [
-      "https://bibliogram.art",
-      "https://bibliogram.snopyta.org",
-      "https://bibliogram.pussthecat.org",
+      "https://bib.actionsack.com",
       "https://bibliogram.1d4.us",
+      "https://bibliogram.art",
+      "https://bibliogram.froth.zone",
+      "https://bibliogram.priv.pw",
+      "https://bibliogram.privacydev.net",
+      "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://bibliogram.hamster.dance",
-      "https://bib.actionsack.com"
+      "https://insta.tromdienste.de"
     ]
   },
   {
@@ -167,7 +173,8 @@
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
-      "https://scribe.froth.zone"
+      "https://scribe.froth.zone",
+      "https://scribe.esmailelbob.xyz"
     ]
   },
   {
@@ -240,11 +247,11 @@
     "test_url": "/search?q=<%=query%>",
     "fallback": "https://searx.be",
     "instances": [
+      "https://anon.sx",
       "https://dynabyte.ca",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
       "https://searx.gnu.style",
-      "https://searx.rasp.fr",
       "https://searx.ru",
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
@@ -271,6 +278,7 @@
       "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
+      "https://search.0relay.com",
       "https://search.ashs.club",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
@@ -300,14 +308,15 @@
       "https://searx.slipfox.xyz/searx",
       "https://searx.tiekoetter.com",
       "https://searx.vimproved.me",
-      "https://searx.youshitsune.me",
       "https://searx.zcyph.cc",
       "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
+      "https://sh0.it",
       "https://swag.pw",
       "https://www.webrats.xyz",
-      "https://xcxc.ml"
+      "https://xcxc.ml",
+      "https://xo.wtf"
     ]
   },
   {
@@ -378,7 +387,7 @@
   },
   {
     "type": "libremdb",
-    "test_url": "/title/tt0133093/",
+    "test_url": "/title/tt0133093",
     "fallback": "https://libremdb.herokuapp.com",
     "instances": [
       "https://libremdb.herokuapp.com",
diff --git a/services.json b/services.json
index 6bf1a45..bc3dba9 100644
--- a/services.json
+++ b/services.json
@@ -4,19 +4,31 @@
     "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://reddit.phii.me",
+      "https://lr.riverside.rocks",
+      "https://libreddit.silkky.cloud",
+      "https://libreddit.database.red",
+      "https://libreddit.exonip.de",
+      "https://libreddit.domain.glass",
       "https://libreddit.sugoma.tk",
+      "https://libreddit.trevorthalacker.com",
       "https://reddit.artemislena.eu",
       "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
       "https://lr.mint.lgbt",
       "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://libreddit.bus-hit.me",
+      "https://de.leddit.xyz"
     ]
   },
   {
@@ -30,7 +42,13 @@
       "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",
@@ -45,12 +63,19 @@
     "test_url": "/u/officialrickastley",
     "fallback": "https://bibliogram.art",
     "instances": [
-      "https://bibliogram.art",
-      "https://bibliogram.snopyta.org",
-      "https://bibliogram.pussthecat.org",
+      "https://bib.actionsack.com",
       "https://bibliogram.1d4.us",
+      "https://bibliogram.art",
+      "https://bibliogram.froth.zone",
+      "https://bibliogram.priv.pw",
+      "https://bibliogram.privacydev.net",
+      "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://bibliogram.hamster.dance"
+      "https://insta.tromdienste.de"
     ]
   },
   {
@@ -59,9 +84,13 @@
     "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",
@@ -82,6 +111,10 @@
     "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"
     ]
   },
@@ -96,21 +129,29 @@
       "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"
     ]
   },
@@ -123,7 +164,8 @@
       "https://scribe.nixnet.services",
       "https://scribe.citizen4.eu",
       "https://scribe.bus-hit.me",
-      "https://scribe.froth.zone"
+      "https://scribe.froth.zone",
+      "https://scribe.esmailelbob.xyz"
     ]
   },
   {
@@ -140,8 +182,10 @@
       "https://translate.beparanoid.de",
       "https://translate.bus-hit.me",
       "https://translate.josias.dev",
+      "https://translate.namazso.eu",
       "https://translate.northboot.xyz",
       "https://translate.priv.pw",
+      "https://translate.riverside.rocks",
       "https://translate.slipfox.xyz",
       "https://translate.tiekoetter.com"
     ]
@@ -163,6 +207,7 @@
     "instances": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me"
     ]
@@ -173,7 +218,13 @@
     "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",
@@ -186,10 +237,11 @@
     "test_url": "/search?q=<%=query%>",
     "fallback": "https://searx.be",
     "instances": [
+      "https://anon.sx",
       "https://dynabyte.ca",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
-      "https://searx.rasp.fr",
+      "https://searx.gnu.style",
       "https://searx.ru",
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
@@ -209,8 +261,10 @@
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://priv.au",
+      "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
+      "https://search.0relay.com",
       "https://search.ashs.club",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
@@ -218,8 +272,12 @@
       "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",
@@ -227,15 +285,17 @@
       "https://searx.ebnar.xyz",
       "https://searx.ericaftereric.top",
       "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.vimproved.me",
-      "https://searx.youshitsune.me",
+      "https://searx.zcyph.cc",
       "https://searxng.tordenskjold.de",
+      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -246,9 +306,11 @@
     "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",
@@ -285,7 +347,9 @@
     "fallback": "https://librex.beparanoid.de",
     "instances": [
       "https://librex.beparanoid.de",
-      "https://search.davidovski.xyz"
+      "https://search.davidovski.xyz",
+      "https://search.funami.tech",
+      "https://librex.catalyst.sx"
     ]
   },
   {
@@ -304,7 +368,7 @@
   },
   {
     "type": "libremdb",
-    "test_url": "/title/tt0133093/",
+    "test_url": "/title/tt0133093",
     "fallback": "https://libremdb.herokuapp.com",
     "instances": [
       "https://libremdb.herokuapp.com",

From 650f28f1d5c710f2882e66cae18a6339bdccc308 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Mon, 1 Aug 2022 22:37:23 -0600
Subject: [PATCH 08/22] [CI] Check for NOERROR return status in dig query

---
 .github/workflows/update-instances.yml |  2 +-
 services.json                          | 62 +-------------------------
 2 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 197b973..17da660 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -37,7 +37,7 @@ jobs:
               ns=$(dig ns "$domain" || true)
               if [[ "$ns" == *"cloudflare"* ]]; then
                 echo "\"$domain\" using cloudflare, skipping..."
-              elif [ ${#ns} -eq 0 ]; then
+              elif [[ "$ns" != *"NOERROR"* ]]; then
                 echo "Unable to verify records for \"$domain\", skipping..."
               else
                 echo "$line" >> out.json
diff --git a/services.json b/services.json
index bc3dba9..ad622e3 100644
--- a/services.json
+++ b/services.json
@@ -4,20 +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://reddit.phii.me",
-      "https://lr.riverside.rocks",
-      "https://libreddit.silkky.cloud",
-      "https://libreddit.database.red",
-      "https://libreddit.exonip.de",
-      "https://libreddit.domain.glass",
       "https://libreddit.sugoma.tk",
-      "https://libreddit.trevorthalacker.com",
       "https://reddit.artemislena.eu",
       "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
@@ -25,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"
     ]
   },
   {
@@ -42,13 +31,7 @@
       "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",
@@ -63,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",
@@ -72,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"
     ]
@@ -84,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",
@@ -111,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"
     ]
   },
@@ -129,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"
     ]
   },
@@ -182,10 +146,8 @@
       "https://translate.beparanoid.de",
       "https://translate.bus-hit.me",
       "https://translate.josias.dev",
-      "https://translate.namazso.eu",
       "https://translate.northboot.xyz",
       "https://translate.priv.pw",
-      "https://translate.riverside.rocks",
       "https://translate.slipfox.xyz",
       "https://translate.tiekoetter.com"
     ]
@@ -207,7 +169,6 @@
     "instances": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
-      "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me"
     ]
@@ -218,13 +179,7 @@
     "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",
@@ -241,7 +196,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",
@@ -261,7 +215,6 @@
       "https://jackgoss.xyz",
       "https://northboot.xyz",
       "https://priv.au",
-      "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
@@ -272,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",
@@ -287,15 +236,12 @@
       "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://searxng.tordenskjold.de",
-      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -306,11 +252,9 @@
     "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",
@@ -347,9 +291,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"
     ]
   },
   {

From 7b36eaac59ce50703042c36bf51f0f4a00682b4f Mon Sep 17 00:00:00 2001
From: uranuspucksaxophone
 <84784521+uranuspucksaxophone@users.noreply.github.com>
Date: Tue, 2 Aug 2022 17:20:26 +0200
Subject: [PATCH 09/22] Center README.md logo and badges [skip ci] (#56)

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b87e8a5..49e3ed2 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
-![Farside](img/farside.svg)
+<div align='center'>
+<img src='img/farside.svg' alt='Farside'>
+</div>
 
+<div align='center'>
+  
 [![Latest Release](https://img.shields.io/github/v/release/benbusby/farside?label=Release)](https://github.com/benbusby/farside/releases)
 [![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)
+  
+</div>
 
 A redirecting service for FOSS alternative frontends.
 

From 6a6bc2d5a16344eca7b8848121ff32e089b282de Mon Sep 17 00:00:00 2001
From: jlund <jlund@binaryteaparty.com>
Date: Tue, 2 Aug 2022 09:21:08 -0600
Subject: [PATCH 10/22] Add "unofficialbird.com" Nitter instance [skip ci]
 (#58)

---
 services-full.json | 3 ++-
 services.json      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/services-full.json b/services-full.json
index 1b735ce..3331bc1 100644
--- a/services-full.json
+++ b/services-full.json
@@ -161,7 +161,8 @@
       "https://nitter.bus-hit.me",
       "https://nttr.stream",
       "https://de.nttr.stream",
-      "https://n.l5.ca"
+      "https://n.l5.ca",
+      "https://unofficialbird.com"
     ]
   },
   {
diff --git a/services.json b/services.json
index ad622e3..89b54d3 100644
--- a/services.json
+++ b/services.json
@@ -116,7 +116,8 @@
       "https://twitter.076.ne.jp",
       "https://nitter.sethforprivacy.com",
       "https://nitter.bus-hit.me",
-      "https://n.l5.ca"
+      "https://n.l5.ca",
+      "https://unofficialbird.com"
     ]
   },
   {

From ddd89ac8e8374077108d3d1fba6f27129dde45ce Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Tue, 2 Aug 2022 13:25:12 -0600
Subject: [PATCH 11/22] Use html tables in readme [skip ci]

Sourcehut doesn't support markdown table formatting, but does support
html tables.
---
 README.md | 113 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 101 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 49e3ed2..232f704 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-<div align='center'>
-<img src='img/farside.svg' alt='Farside'>
+<div align="center">
+<img src="https://benbusby.com/assets/images/farside.svg" alt="Farside">
 </div>
 
-<div align='center'>
-  
+<div align="center">
+
 [![Latest Release](https://img.shields.io/github/v/release/benbusby/farside?label=Release)](https://github.com/benbusby/farside/releases)
 [![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)
-  
+
 </div>
 
 A redirecting service for FOSS alternative frontends.
@@ -25,6 +25,79 @@ Farside's links work with the following structure: `farside.link/<service>/<path
 
 For example:
 
+<table>
+    <tr>
+        <td>Service</td>
+        <td>Page</td>
+        <td>Farside Link</td>
+    </tr>
+    <tr>
+        <td><a href="https://github.com/spikecodes/libreddit">Libreddit</a></td>
+        <td>/r/popular</td>
+        <td>https://farside.link/libreddit/r/popular</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>
+    </tr>
+    <tr>
+        <td><a href="https://github.com/zedeus/nitter">Nitter</a></td>
+        <td>User Profile</td>
+        <td>https://farside.link/nitter/josevalim</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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </tr>
+</table>
+
 | Service | Page | Farside Link |
 | -- | -- | -- |
 | [Libreddit](https://github.com/spikecodes/libreddit) | /r/popular | https://farside.link/libreddit/r/popular
@@ -41,7 +114,7 @@ For example:
 | [Rimgo](https://codeberg.org/video-prize-ranch/rimgo) | View photo album | https://farside.link/rimgo/a/H8M4rcp
 | [Scribe](https://sr.ht/~edwardloveall/scribe/) | View Medium post | https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c
 
-<sup>This table doesn't include all available services. For a complete list of supported frontends, see: https://farside.link</sup>
+<sup>Note: This table doesn't include all available services. For a complete list of supported frontends, see: https://farside.link</sup>
 
 Farside also accepts URLs to "parent" services, and will redirect to an appropriate front end service, for example:
 
@@ -125,9 +198,25 @@ goes against what Farside is trying to solve. Use at your own discretion.
 
 ### Environment Variables
 
-| Name | Purpose |
-| -- | -- |
-| FARSIDE_TEST | If enabled, bypasses the instance availability check and adds all instances to the pool. |
-| FARSIDE_PORT | The port to run Farside on (default: `4001`) |
-| FARSIDE_REDIS_PORT | The Redis server port to use (default: `6379`, same as the default for Redis) |
-| FARSIDE_SERVICES_JSON | The "services" JSON file to use for selecting instances (default: `services.json`) |
+<table>
+    <tr>
+        <td>Name</td>
+        <td>Purpose</td>
+    </tr>
+    <tr>
+        <td>FARSIDE_TEST</td>
+        <td>If enabled, bypasses the instance availability check and adds all instances to the pool.</td>
+    </tr>
+    <tr>
+        <td>FARSIDE_PORT</td>
+        <td>The port to run Farside on (default: `4001`)</td>
+    </tr>
+    <tr>
+        <td>FARSIDE_REDIS_PORT</td>
+        <td>The Redis server port to use (default: `6379`, same as the default for Redis)</td>
+    </tr>
+    <tr>
+        <td>FARSIDE_SERVICES_JSON</td>
+        <td>The "services" JSON file to use for selecting instances (default: `services.json`)</td>
+    </tr>
+</table>

From 3be0c1b992affd9425351592439315bfb0050fba Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Tue, 2 Aug 2022 13:26:22 -0600
Subject: [PATCH 12/22] Remove leftover markdown table in readme [skip ci]

---
 README.md | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/README.md b/README.md
index 232f704..e32142a 100644
--- a/README.md
+++ b/README.md
@@ -98,22 +98,6 @@ For example:
     </tr>
 </table>
 
-| Service | Page | Farside Link |
-| -- | -- | -- |
-| [Libreddit](https://github.com/spikecodes/libreddit) | /r/popular | https://farside.link/libreddit/r/popular
-| [Teddit](https://codeberg.org/teddit/teddit) | /r/popular | https://farside.link/teddit/r/popular
-| [Nitter](https://github.com/zedeus/nitter) | User Profile | https://farside.link/nitter/josevalim
-| [Invidious](https://github.com/iv-org/invidious) | Home Page | https://farside.link/invidious
-| [Piped](https://github.com/TeamPiped/Piped) | Video Page | https://farside.link/piped/watch?v=eBGIQ7ZuuiU
-| [Bibliogram](https://sr.ht/~cadence/bibliogram/) | User Profile | https://farside.link/bibliogram/u/kbdfans
-| [Whoogle](https://github.com/benbusby/whoogle-search) | Search "Elixir" | https://farside.link/whoogle/search?q=elixir&lang_interface=en
-| [SearX](https://github.com/searx/searx) | Search "Redis" | https://farside.link/searx/search?q=redis
-| [SearXNG](https://github.com/searxng/searxng) | Search "EFF" | https://farside.link/searxng/search?q=EFF
-| [SimplyTranslate](https://git.sr.ht/~metalune/simplytranslate_web) | Translate "hola" | https://farside.link/simplytranslate/?engine=google&text=hola
-| [Lingva](https://github.com/TheDavidDelta/lingva-translate) | Translate "bonjour" | https://farside.link/lingva/auto/en/bonjour
-| [Rimgo](https://codeberg.org/video-prize-ranch/rimgo) | View photo album | https://farside.link/rimgo/a/H8M4rcp
-| [Scribe](https://sr.ht/~edwardloveall/scribe/) | View Medium post | https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c
-
 <sup>Note: This table doesn't include all available services. For a complete list of supported frontends, see: https://farside.link</sup>
 
 Farside also accepts URLs to "parent" services, and will redirect to an appropriate front end service, for example:

From 80698331cb77cb9128af0c9b9d47493eda718baa Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Tue, 2 Aug 2022 13:33:20 -0600
Subject: [PATCH 13/22] Fix readme logo spacing [skip ci]

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e32142a..c1435c7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-<div align="center">
+<div align="center" style="margin-bottom: 10px;">
 <img src="https://benbusby.com/assets/images/farside.svg" alt="Farside">
 </div>
+<br>
 
 <div align="center">
 

From 9989237589879a3b3453e54704bdad07c0cf2e56 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 00:12:50 +0000
Subject: [PATCH 14/22] [CI] Auto update instances

---
 services-full.json |  1 -
 services.json      | 73 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/services-full.json b/services-full.json
index 3331bc1..27ac3bc 100644
--- a/services-full.json
+++ b/services-full.json
@@ -256,7 +256,6 @@
       "https://searx.ru",
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
-      "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.webheberg.info",
       "https://searx.xyz",
diff --git a/services.json b/services.json
index 89b54d3..3b7e9e7 100644
--- a/services.json
+++ b/services.json
@@ -4,11 +4,18 @@
     "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.phii.me",
-      "https://libreddit.sugoma.tk",
+      "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.artemislena.eu",
       "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
@@ -16,8 +23,10 @@
       "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://libreddit.bus-hit.me",
+      "https://de.leddit.xyz"
     ]
   },
   {
@@ -28,15 +37,18 @@
       "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.nautolan.racing",
+      "https://teddit.garudalinux.org",
+      "https://teddit.ggc-project.de",
+      "https://teddit.httpjames.space",
+      "https://teddit.namazso.eu",
       "https://teddit.net",
       "https://teddit.pussthecat.org",
       "https://teddit.sethforprivacy.com",
-      "https://teddit.tinfoil-hat.net",
       "https://teddit.totaldarkness.net",
       "https://teddit.zaggy.nl"
     ]
@@ -46,6 +58,7 @@
     "test_url": "/u/officialrickastley",
     "fallback": "https://bibliogram.art",
     "instances": [
+      "https://bib.actionsack.com",
       "https://bibliogram.1d4.us",
       "https://bibliogram.art",
       "https://bibliogram.froth.zone",
@@ -54,6 +67,8 @@
       "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"
     ]
@@ -64,9 +79,13 @@
     "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",
@@ -87,6 +106,10 @@
     "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"
     ]
   },
@@ -101,21 +124,29 @@
       "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"
     ]
@@ -146,9 +177,10 @@
       "https://tl.vern.cc",
       "https://translate.beparanoid.de",
       "https://translate.bus-hit.me",
-      "https://translate.josias.dev",
+      "https://translate.namazso.eu",
       "https://translate.northboot.xyz",
       "https://translate.priv.pw",
+      "https://translate.riverside.rocks",
       "https://translate.slipfox.xyz",
       "https://translate.tiekoetter.com"
     ]
@@ -170,6 +202,7 @@
     "instances": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me"
     ]
@@ -180,10 +213,15 @@
     "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"
     ]
@@ -197,10 +235,10 @@
       "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",
-      "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.webheberg.info",
       "https://searx.xyz"
@@ -211,11 +249,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",
@@ -226,8 +264,12 @@
       "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",
@@ -237,12 +279,14 @@
       "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://searxng.tordenskjold.de",
+      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -253,10 +297,11 @@
     "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.lunar.icu",
+      "https://wikiless.funami.tech",
       "https://wikiless.northboot.xyz",
       "https://wikiless.org",
       "https://wikiless.sethforprivacy.com",
@@ -292,7 +337,9 @@
     "fallback": "https://librex.beparanoid.de",
     "instances": [
       "https://librex.beparanoid.de",
-      "https://search.davidovski.xyz"
+      "https://search.davidovski.xyz",
+      "https://search.funami.tech",
+      "https://librex.catalyst.sx"
     ]
   },
   {

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 15/22] 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"
     ]
   },
   {

From e16d4bb3308922ceafaa5aed0b15182f940e4a3f Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Aug 2022 00:11:16 +0000
Subject: [PATCH 16/22] [CI] Auto update instances

---
 services-full.json |  1 -
 services.json      | 74 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/services-full.json b/services-full.json
index 27ac3bc..419fa25 100644
--- a/services-full.json
+++ b/services-full.json
@@ -271,7 +271,6 @@
       "https://de.xcxc.ml",
       "https://etsi.me",
       "https://jackgoss.xyz",
-      "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
diff --git a/services.json b/services.json
index d982e19..4300fdf 100644
--- a/services.json
+++ b/services.json
@@ -4,11 +4,18 @@
     "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.phii.me",
-      "https://libreddit.sugoma.tk",
+      "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.artemislena.eu",
       "https://libreddit.some-things.org",
       "https://reddit.stuehieyr.com",
@@ -16,8 +23,10 @@
       "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://libreddit.bus-hit.me",
+      "https://de.leddit.xyz"
     ]
   },
   {
@@ -28,15 +37,18 @@
       "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.nautolan.racing",
+      "https://teddit.garudalinux.org",
+      "https://teddit.ggc-project.de",
+      "https://teddit.httpjames.space",
+      "https://teddit.namazso.eu",
       "https://teddit.net",
       "https://teddit.pussthecat.org",
       "https://teddit.sethforprivacy.com",
-      "https://teddit.tinfoil-hat.net",
       "https://teddit.totaldarkness.net",
       "https://teddit.zaggy.nl"
     ]
@@ -46,6 +58,7 @@
     "test_url": "/u/officialrickastley",
     "fallback": "https://bibliogram.art",
     "instances": [
+      "https://bib.actionsack.com",
       "https://bibliogram.1d4.us",
       "https://bibliogram.art",
       "https://bibliogram.froth.zone",
@@ -54,6 +67,8 @@
       "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"
     ]
@@ -64,9 +79,13 @@
     "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",
@@ -87,6 +106,10 @@
     "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"
     ]
   },
@@ -101,21 +124,29 @@
       "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"
     ]
@@ -146,9 +177,10 @@
       "https://tl.vern.cc",
       "https://translate.beparanoid.de",
       "https://translate.bus-hit.me",
-      "https://translate.josias.dev",
+      "https://translate.namazso.eu",
       "https://translate.northboot.xyz",
       "https://translate.priv.pw",
+      "https://translate.riverside.rocks",
       "https://translate.slipfox.xyz",
       "https://translate.tiekoetter.com"
     ]
@@ -170,6 +202,7 @@
     "instances": [
       "https://i.bcow.xyz",
       "https://rimgo.pussthecat.org",
+      "https://img.riverside.rocks",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.bus-hit.me"
     ]
@@ -180,10 +213,15 @@
     "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"
     ]
@@ -197,6 +235,7 @@
       "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",
@@ -210,11 +249,10 @@
     "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",
@@ -225,8 +263,12 @@
       "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",
@@ -236,13 +278,14 @@
       "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.vimproved.me",
+      "https://searx.zcyph.cc",
       "https://searxng.tordenskjold.de",
+      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -253,10 +296,11 @@
     "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.lunar.icu",
+      "https://wikiless.funami.tech",
       "https://wikiless.northboot.xyz",
       "https://wikiless.org",
       "https://wikiless.sethforprivacy.com",
@@ -292,7 +336,9 @@
     "fallback": "https://librex.beparanoid.de",
     "instances": [
       "https://librex.beparanoid.de",
-      "https://search.davidovski.xyz"
+      "https://search.davidovski.xyz",
+      "https://search.funami.tech",
+      "https://librex.catalyst.sx"
     ]
   },
   {

From e1e46dcd9271e68492db5fe259c1593f02e7ef84 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Thu, 4 Aug 2022 13:16:58 -0600
Subject: [PATCH 17/22] Remove cloudflare filter from update workflow

The cloudflare filter, when performed as part of the github action
workflow, doesn't seem to work nearly as reliably when run on an actual
machine.

The farside server will instead run the un-cloudflare script whenever it
pulls in new changes to services-full.json, which should be a much more
reliable approach to filtering out cloudflare instances.
---
 .github/workflows/update-instances.yml | 32 -----------
 services.json                          | 73 +++++---------------------
 tools/un-cloudflare.sh                 |  4 +-
 3 files changed, 14 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 17da660..7f483ac 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -27,33 +27,6 @@ jobs:
           sed -i 's/\/"/"/g' services-full.json
         }
 
-        function remove_cf_instances() {
-          rm -f out.json
-          file="services-full.json"
-
-          while read -r line; do
-            if [[ "$line" == "\"https://"* ]]; then
-              domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//")
-              ns=$(dig ns "$domain" || true)
-              if [[ "$ns" == *"cloudflare"* ]]; then
-                echo "\"$domain\" using cloudflare, skipping..."
-              elif [[ "$ns" != *"NOERROR"* ]]; then
-                echo "Unable to verify records for \"$domain\", skipping..."
-              else
-                echo "$line" >> out.json
-              fi
-            else
-              echo "$line" >> out.json
-            fi
-          done <$file
-
-          # Remove any trailing commas from new instance lists
-          sed -i -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
-
-          cat out.json | jq --indent 2 . > services.json
-          rm -f out.json
-        }
-
         # ==============================================================
         # Git config
         # ==============================================================
@@ -216,11 +189,6 @@ jobs:
         # TODO: Update instances for other services
         # ==============================================================
 
-        # ==============================================================
-        # Remove cloudflare instances
-        # ==============================================================
-        remove_cf_instances
-
         # ==============================================================
         # Push changes
         # ==============================================================
diff --git a/services.json b/services.json
index 4300fdf..ea5ce7d 100644
--- a/services.json
+++ b/services.json
@@ -4,29 +4,19 @@
     "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",
-      "https://lr.mint.lgbt",
       "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 +27,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 +45,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 +53,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 +63,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 +86,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 +100,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 +145,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 +169,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 +179,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 +196,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,10 +209,10 @@
     "test_url": "/search?q=<%=query%>",
     "fallback": "https://searx.be",
     "instances": [
+      "https://darmarit.org/searx",
       "https://de.xcxc.ml",
       "https://jackgoss.xyz",
       "https://priv.au",
-      "https://s.frlt.one",
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
@@ -263,12 +223,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",
@@ -278,14 +234,12 @@
       "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://searxng.tordenskjold.de",
-      "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://swag.pw",
       "https://xcxc.ml"
@@ -296,11 +250,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",
@@ -336,9 +289,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"
     ]
   },
   {
diff --git a/tools/un-cloudflare.sh b/tools/un-cloudflare.sh
index b10178b..dd5c716 100755
--- a/tools/un-cloudflare.sh
+++ b/tools/un-cloudflare.sh
@@ -10,7 +10,7 @@ while read -r line; do
         ns=$(dig ns "$domain" || true)
         if [[ "$ns" == *"cloudflare"* ]]; then
             echo "\"$domain\" using cloudflare, skipping..."
-        elif [ ${#ns} -eq 0 ]; then
+        elif [[ "$ns" != *"NOERROR"* ]]; then
             echo "Unable to verify records for \"$domain\", skipping..."
         else
             echo "$line" >> out.json
@@ -21,7 +21,7 @@ while read -r line; do
 done <$file
 
 # Remove any trailing commas from new instance lists
-sed -i '' -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
+sed -i -e ':begin' -e '$!N' -e 's/,\n]/\n]/g' -e 'tbegin' -e 'P' -e 'D' out.json
 
 cat out.json | jq --indent 2 . > services.json
 rm -f out.json

From 6d40562166479a2012d14e56e96ca519cb1102e8 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Aug 2022 00:12:08 +0000
Subject: [PATCH 18/22] [CI] Auto update instances

---
 services-full.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services-full.json b/services-full.json
index 419fa25..433670a 100644
--- a/services-full.json
+++ b/services-full.json
@@ -256,6 +256,7 @@
       "https://searx.ru",
       "https://searx.sp-codes.de",
       "https://searx.stuehieyr.com",
+      "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
       "https://searx.webheberg.info",
       "https://searx.xyz",
@@ -308,7 +309,6 @@
       "https://searx.tiekoetter.com",
       "https://searx.vimproved.me",
       "https://searx.zcyph.cc",
-      "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://sh0.it",

From 3861b9360442b49976c37ba8a7ff2ea154eefe31 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 6 Aug 2022 00:10:23 +0000
Subject: [PATCH 19/22] [CI] Auto update instances

---
 services-full.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services-full.json b/services-full.json
index 433670a..cac809e 100644
--- a/services-full.json
+++ b/services-full.json
@@ -250,6 +250,7 @@
     "instances": [
       "https://anon.sx",
       "https://dynabyte.ca",
+      "https://northboot.xyz",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
       "https://searx.gnu.style",
@@ -272,6 +273,7 @@
       "https://de.xcxc.ml",
       "https://etsi.me",
       "https://jackgoss.xyz",
+      "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
       "https://priv.au",
@@ -280,6 +282,7 @@
       "https://saber.tk",
       "https://search.0relay.com",
       "https://search.ashs.club",
+      "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
       "https://search.gcomm.ch",
@@ -299,6 +302,7 @@
       "https://searx.ebnar.xyz",
       "https://searx.ericaftereric.top",
       "https://searx.fmac.xyz",
+      "https://searx.kujonello.cf",
       "https://searx.mha.fi",
       "https://searx.mistli.net",
       "https://searx.namejeff.xyz",
@@ -309,10 +313,12 @@
       "https://searx.tiekoetter.com",
       "https://searx.vimproved.me",
       "https://searx.zcyph.cc",
+      "https://searxng.tordenskjold.de",
       "https://searxng.zackptg5.com",
       "https://serx.ml",
       "https://sh0.it",
       "https://swag.pw",
+      "https://www.higgssearch.com",
       "https://www.webrats.xyz",
       "https://xcxc.ml",
       "https://xo.wtf"

From f24232af355d6f0b3710a5e0aca9f499c665e3b6 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 7 Aug 2022 00:12:35 +0000
Subject: [PATCH 20/22] [CI] Auto update instances

---
 services-full.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services-full.json b/services-full.json
index cac809e..ec91ce0 100644
--- a/services-full.json
+++ b/services-full.json
@@ -281,7 +281,6 @@
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
-      "https://search.ashs.club",
       "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",

From e6b47888ee0f0d2613d15915ad01194148bbf1f5 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 00:09:40 +0000
Subject: [PATCH 21/22] [CI] Auto update instances

---
 services-full.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services-full.json b/services-full.json
index ec91ce0..f43a0a3 100644
--- a/services-full.json
+++ b/services-full.json
@@ -249,7 +249,6 @@
     "fallback": "https://searx.be",
     "instances": [
       "https://anon.sx",
-      "https://dynabyte.ca",
       "https://northboot.xyz",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
@@ -281,7 +280,6 @@
       "https://s.zhaocloud.net",
       "https://saber.tk",
       "https://search.0relay.com",
-      "https://search.bingowaves.xyz",
       "https://search.bus-hit.me",
       "https://search.chemicals-in-the-water.eu",
       "https://search.gcomm.ch",

From d77040b7a42bfe991c763208630d3bc19261860c Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Aug 2022 00:11:24 +0000
Subject: [PATCH 22/22] [CI] Auto update instances

---
 services-full.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services-full.json b/services-full.json
index f43a0a3..bf427b8 100644
--- a/services-full.json
+++ b/services-full.json
@@ -249,6 +249,7 @@
     "fallback": "https://searx.be",
     "instances": [
       "https://anon.sx",
+      "https://dynabyte.ca",
       "https://northboot.xyz",
       "https://search.neet.works",
       "https://searx.divided-by-zero.eu",
@@ -258,7 +259,6 @@
       "https://searx.stuehieyr.com",
       "https://searx.tuxcloud.net",
       "https://searx.tyil.nl",
-      "https://searx.webheberg.info",
       "https://searx.xyz",
       "https://www.webrats.xyz"
     ]
@@ -287,7 +287,6 @@
       "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",