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] [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"
     ]
   },
   {