[CI] Auto update instances

The sourcehut link is (rightfully) blocking unauthenticated requests, so
using the github link is more reliable.

.formatter.exs

@@ -1,4 +0,0 @@
-# Used by "mix format"
-[
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
-]

.github/workflows/update-instances.yml

@@ -251,12 +251,6 @@ jobs:
             .clearnet] |
             sort' > librey-tmp.json
 
-        jq --slurpfile librex librey-tmp.json \
-          '( .[] | select(.type == "librex") )
-          .instances |= $librex[0]' services-full.json > services-tmp.json
-
-        mv services-tmp.json services-full.json
-
         jq --slurpfile librey librey-tmp.json \
           '( .[] | select(.type == "librey") )
           .instances |= $librey[0]' services-full.json > services-tmp.json

README.md

@@ -1,5 +1,5 @@
 <div align="center" style="margin-bottom: 10px;">
-<img src="https://benbusby.com/assets/images/farside.svg" alt="Farside">
+<img src="https://raw.githubusercontent.com/benbusby/farside/refs/heads/main/img/farside.svg" alt="Farside">
 </div>
 <br>
 

db/cron.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -18,9 +19,14 @@ const defaultPrimary = "https://farside.link/state"
 const defaultCFPrimary = "https://cf.farside.link/state"
 
 var LastUpdate time.Time
+var skipInstanceChecks = []string{
+	"searx",
+	"searxng",
+}
 
 func InitCronTasks() {
 	log.Println("Initializing cron tasks...")
+	updateServiceList()
 
 	cronDisabled := os.Getenv("FARSIDE_CRON")
 	if len(cronDisabled) == 0 || cronDisabled == "1" {
@@ -58,6 +64,8 @@ func queryServiceInstances() {
 	}
 
 	for _, service := range services.ServiceList {
+		canSkip := slices.Contains[[]string, string](skipInstanceChecks, service.Type)
+
 		fmt.Printf("===== %s =====\n", service.Type)
 		var instances []string
 		for _, instance := range service.Instances {
@@ -68,7 +76,7 @@ func queryServiceInstances() {
 			available := queryServiceInstance(
 				instance,
 				testURL,
-			)
+				canSkip)
 
 			if available {
 				instances = append(instances, instance)
@@ -105,12 +113,17 @@ func fetchInstancesFromPrimary() ([]services.Service, error) {
 	return serviceList, err
 }
 
-func queryServiceInstance(instance, testURL string) bool {
+func queryServiceInstance(instance, testURL string, canSkipCheck bool) bool {
 	testMode := os.Getenv("FARSIDE_TEST")
 	if len(testMode) > 0 && testMode == "1" {
 		return true
 	}
 
+	if canSkipCheck {
+		fmt.Printf("    [INFO] Adding %s\n", instance)
+		return true
+	}
+
 	ua := "Mozilla/5.0 (compatible; Farside/1.0.0; +https://farside.link)"
 	url := instance + testURL
 

main.go

@@ -24,7 +24,7 @@ func main() {
 		}
 	}()
 
-	db.InitCronTasks()
+	go db.InitCronTasks()
 
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, os.Interrupt, syscall.SIGTERM)

server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	_ "embed"
 	"encoding/json"
+	"fmt"
 	"html/template"
 	"log"
 	"net/http"
@@ -61,22 +62,22 @@ func state(w http.ResponseWriter, r *http.Request) {
 }
 
 func baseRouting(w http.ResponseWriter, r *http.Request) {
-	routing(w, r, false)
+	routing(w, r, false, r.URL.RawQuery)
 }
 
 func jsRouting(w http.ResponseWriter, r *http.Request) {
 	r.URL.Path = strings.Replace(r.URL.Path, "/_", "", 1)
-	routing(w, r, true)
+	routing(w, r, true, r.URL.RawQuery)
 }
 
-func routing(w http.ResponseWriter, r *http.Request, jsEnabled bool) {
+func routing(w http.ResponseWriter, r *http.Request, jsEnabled bool, query string) {
 	value := r.PathValue("routing")
 	if len(value) == 0 {
 		value = r.URL.Path
 	}
 
-	url, _ := url.Parse(value)
+	parsedURL, _ := url.Parse(value)
-	path := strings.TrimPrefix(url.Path, "/")
+	path := strings.TrimPrefix(parsedURL.Path, "/")
 	segments := strings.Split(path, "/")
 
 	if len(segments[0]) == 0 {
@@ -85,8 +86,9 @@ func routing(w http.ResponseWriter, r *http.Request, jsEnabled bool) {
 
 	target, err := services.MatchRequest(segments[0])
 	if err != nil {
+		errMsg := fmt.Sprintf("No routing found for '%s'", segments[0])
 		log.Printf("Error during match request: %v\n", err)
-		http.Error(w, "No routing found for "+target, http.StatusBadRequest)
+		http.Error(w, errMsg, http.StatusBadRequest)
 		return
 	}
 
@@ -119,6 +121,7 @@ func routing(w http.ResponseWriter, r *http.Request, jsEnabled bool) {
 	w.Header().Set("Pragma", "no-cache")
 	w.Header().Set("Expires", "0")
 
+	instance += fmt.Sprintf("?%s", query)
 	if jsEnabled {
 		data := routeData{
 			InstanceURL: instance,

services-full.json

@@ -4,23 +4,17 @@
     "test_url": "/r/popular",
     "fallback": "https://redlib.freedit.eu",
     "instances": [
-      "https://l.opnxng.com",
+      "https://eu.safereddit.com",
-      "https://r.darrennathanael.com",
+      "https://libreddit.diffraction.dev",
-      "https://red.arancia.click",
+      "https://lr.ptr.moe",
-      "https://red.artemislena.eu",
-      "https://red.ngn.tf",
       "https://reddit.nerdvpn.de",
+      "https://reddit.rtrace.io",
+      "https://redlib.4o1x5.dev",
+      "https://redlib.baczek.me",
       "https://redlib.catsarch.com",
-      "https://redlib.ducks.party",
-      "https://redlib.kittywi.re",
-      "https://redlib.nadeko.net",
       "https://redlib.perennialte.ch",
-      "https://redlib.privacy.com.de",
       "https://redlib.privacyredirect.com",
-      "https://redlib.r4fo.com",
+      "https://redlib.r4fo.com"
-      "https://rl.bloat.cat",
-      "https://rl.rootdo.com",
-      "https://safereddit.com"
     ]
   },
   {
@@ -28,23 +22,17 @@
     "test_url": "/r/popular",
     "fallback": "https://redlib.freedit.eu",
     "instances": [
-      "https://l.opnxng.com",
+      "https://eu.safereddit.com",
-      "https://r.darrennathanael.com",
+      "https://libreddit.diffraction.dev",
-      "https://red.arancia.click",
+      "https://lr.ptr.moe",
-      "https://red.artemislena.eu",
-      "https://red.ngn.tf",
       "https://reddit.nerdvpn.de",
+      "https://reddit.rtrace.io",
+      "https://redlib.4o1x5.dev",
+      "https://redlib.baczek.me",
       "https://redlib.catsarch.com",
-      "https://redlib.ducks.party",
-      "https://redlib.kittywi.re",
-      "https://redlib.nadeko.net",
       "https://redlib.perennialte.ch",
-      "https://redlib.privacy.com.de",
       "https://redlib.privacyredirect.com",
-      "https://redlib.r4fo.com",
+      "https://redlib.r4fo.com"
-      "https://rl.bloat.cat",
-      "https://rl.rootdo.com",
-      "https://safereddit.com"
     ]
   },
   {
@@ -100,6 +88,7 @@
     "fallback": "https://invidious.snopyta.org",
     "instances": [
       "https://inv.nadeko.net",
+      "https://invidious.f5.si",
       "https://invidious.nerdvpn.de",
       "https://yewtu.be"
     ]
@@ -135,8 +124,14 @@
     "fallback": "https://nitter.net",
     "instances": [
       "https://lightbrd.com",
+      "https://nitter.kareem.one",
+      "https://nitter.kuuro.net",
+      "https://nitter.net",
       "https://nitter.poast.org",
-      "https://nitter.privacydev.net",
+      "https://nitter.privacyredirect.com",
+      "https://nitter.space",
+      "https://nitter.tiekoetter.com",
+      "https://nuku.trabun.org",
       "https://xcancel.com"
     ]
   },
@@ -206,13 +201,17 @@
     "test_url": "/a/H8M4rcp",
     "fallback": "https://rimgo.projectsegfau.lt",
     "instances": [
-      "https://i.habedieeh.re",
+      "https://i.datuan.dev",
       "https://imgur.010032.xyz",
       "https://imgur.artemislena.eu",
+      "https://imgur.fsky.io",
       "https://imgur.nerdvpn.de",
+      "https://imgur.sudovanilla.org",
+      "https://r.opnxng.com",
       "https://ri.nadeko.net",
       "https://rimgo.4o1x5.dev",
       "https://rimgo.aketawi.space",
+      "https://rimgo.astrial.org",
       "https://rimgo.bloat.cat",
       "https://rimgo.bus-hit.me",
       "https://rimgo.canine.tools",
@@ -224,7 +223,6 @@
       "https://rimgo.fascinated.cc",
       "https://rimgo.frontendfriendly.xyz",
       "https://rimgo.frylo.net",
-      "https://rimgo.gitro.xyz",
       "https://rimgo.hostux.net",
       "https://rimgo.in.projectsegfau.lt",
       "https://rimgo.lunar.icu",
@@ -238,7 +236,6 @@
       "https://rimgo.thebunny.zone",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.us.projectsegfau.lt",
-      "https://rimgo.whateveritworks.org",
       "https://rmgur.com"
     ]
   },
@@ -247,30 +244,12 @@
     "test_url": "/search?cookies_disabled=1&q=<%=query%>",
     "fallback": "https://search.sethforprivacy.com",
     "instances": [
-      "https://gowogle.voring.me",
-      "https://s.tokhmi.xyz",
-      "https://search.albony.xyz",
-      "https://search.dr460nf1r3.org",
       "https://search.garudalinux.org",
-      "https://search.nezumi.party",
-      "https://search.notrustverify.ch",
       "https://search.sethforprivacy.com",
-      "https://search.snine.nl",
       "https://wg.vern.cc",
-      "https://wgl.frail.duckdns.org",
+      "https://whoogle.4040940.xyz",
-      "https://whoogle-search--replitcomreside.repl.co",
-      "https://whoogle.datura.network",
-      "https://whoogle.dcs0.hu",
-      "https://whoogle.ftw.lol",
-      "https://whoogle.hostux.net",
-      "https://whoogle.hxvy0.gq",
       "https://whoogle.lunar.icu",
-      "https://whoogle.no-logs.com",
+      "https://whoogle.privacydev.net"
-      "https://whoogle.privacydev.net",
-      "https://whoogle.ungovernable.men",
-      "https://whoogle.yepserver.xyz",
-      "https://whoogle2.ungovernable.men",
-      "https://whoogle3.ungovernable.men"
     ]
   },
   {
@@ -295,47 +274,44 @@
     "fallback": "https://searx.be",
     "instances": [
       "https://baresearch.org",
-      "https://kantan.cat",
+      "https://copp.gg",
+      "https://find.xenorio.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
-      "https://priv.au",
       "https://s.mble.dk",
       "https://search.080609.xyz",
-      "https://search.blitzw.in",
-      "https://search.canine.tools",
       "https://search.catboy.house",
       "https://search.citw.lgbt",
       "https://search.einfachzocken.eu",
-      "https://search.gcomm.ch",
+      "https://search.federicociro.com",
       "https://search.im-in.space",
       "https://search.ipv6s.net",
       "https://search.leptons.xyz",
       "https://search.mdosch.de",
-      "https://search.nadeko.net",
       "https://search.nerdvpn.de",
       "https://search.ononoki.org",
-      "https://search.privacyredirect.com",
-      "https://search.projectsegfau.lt",
-      "https://search.rhscz.eu",
       "https://search.rowie.at",
       "https://search.sapti.me",
       "https://search.url4irl.com",
       "https://searx.ankha.ac",
-      "https://searx.be",
       "https://searx.dresden.network",
-      "https://searx.electroncash.de",
       "https://searx.foobar.vip",
       "https://searx.foss.family",
       "https://searx.namejeff.xyz",
       "https://searx.ox2.fr",
+      "https://searx.perennialte.ch",
       "https://searx.rhscz.eu",
+      "https://searx.stream",
       "https://searx.tiekoetter.com",
+      "https://searx.tuxcloud.net",
+      "https://searxng.deliberate.world",
+      "https://searxng.f24o.zip",
       "https://searxng.hweeren.com",
       "https://searxng.shreven.org",
       "https://searxng.site",
-      "https://searxng.world",
+      "https://seek.fyi",
-      "https://seek.fyi"
+      "https://suche.dasnetzundich.de"
     ]
   },
   {
@@ -347,7 +323,6 @@
       "https://wiki.adminforge.de",
       "https://wiki.froth.zone",
       "https://wiki.privacytools.io",
-      "https://wiki.slipfox.xyz",
       "https://wikiless.esmailelbob.xyz",
       "https://wikiless.funami.tech",
       "https://wikiless.lunar.icu",
@@ -391,41 +366,6 @@
       "https://cringe.whateveritworks.org"
     ]
   },
-  {
-    "type": "librex",
-    "test_url": "/search.php?q=<%=query%>",
-    "fallback": "https://librex.myroware.eu",
-    "instances": [
-      "https://glass.prpl.wtf",
-      "https://libre-find.online",
-      "https://libre.blitzw.in",
-      "https://librex.nohost.network",
-      "https://librex.uk.to",
-      "https://librey.4o1x5.dev",
-      "https://librey.baczek.me",
-      "https://librey.darkness.services",
-      "https://librey.franklyflawless.org",
-      "https://librey.ix.tc",
-      "https://librey.milivojevic.in.rs",
-      "https://librey.myroware.net",
-      "https://librey.nirn.quest",
-      "https://librey.org",
-      "https://librey.retro-hax.net",
-      "https://lx.benike.me",
-      "https://ly.owo.si",
-      "https://search.ahwx.org",
-      "https://search.davidovski.xyz",
-      "https://search.funami.tech",
-      "https://search.pabloferreiro.es",
-      "https://search.revvy.de",
-      "https://search.seitan-ayoub.lol",
-      "https://search.technicalvoid.dev",
-      "https://search.uwabaki.party",
-      "https://search.zeroish.xyz",
-      "https://search2.ahwx.org",
-      "https://serp.catswords.net"
-    ]
-  },
   {
     "type": "quetre",
     "test_url": "/How-does-the-Z-boson-decay",
@@ -589,33 +529,21 @@
     "test_url": "/search.php?q=<%=query%>",
     "fallback": "https://search.ahwx.org",
     "instances": [
-      "https://glass.prpl.wtf",
-      "https://libre-find.online",
       "https://libre.blitzw.in",
       "https://librex.nohost.network",
-      "https://librex.uk.to",
       "https://librey.4o1x5.dev",
       "https://librey.baczek.me",
       "https://librey.darkness.services",
-      "https://librey.franklyflawless.org",
+      "https://librey.nube-gran.de",
-      "https://librey.ix.tc",
-      "https://librey.milivojevic.in.rs",
-      "https://librey.myroware.net",
-      "https://librey.nirn.quest",
       "https://librey.org",
-      "https://librey.retro-hax.net",
+      "https://librey.sny.sh",
-      "https://lx.benike.me",
       "https://ly.owo.si",
-      "https://search.ahwx.org",
       "https://search.davidovski.xyz",
       "https://search.funami.tech",
-      "https://search.pabloferreiro.es",
+      "https://search.liv.town",
       "https://search.revvy.de",
-      "https://search.seitan-ayoub.lol",
       "https://search.technicalvoid.dev",
       "https://search.uwabaki.party",
-      "https://search.zeroish.xyz",
-      "https://search2.ahwx.org",
       "https://serp.catswords.net"
     ]
   },
@@ -626,8 +554,14 @@
     "instances": [
       "https://bandcamp.lurkmore.com",
       "https://tent.bloat.cat",
+      "https://tent.canine.tools",
       "https://tent.deep-swarm.xyz",
+      "https://tent.lab8.cz",
+      "https://tent.private.coffee",
+      "https://tent.qunn.link",
       "https://tent.sny.sh",
+      "https://tn.dc09.ru",
+      "https://tn.maid.zone",
       "https://tn.vern.cc"
     ]
   }

services.json

@@ -4,21 +4,15 @@
     "test_url": "/r/popular",
     "fallback": "https://redlib.freedit.eu",
     "instances": [
-      "https://l.opnxng.com",
+      "https://eu.safereddit.com",
-      "https://r.darrennathanael.com",
+      "https://libreddit.diffraction.dev",
-      "https://red.arancia.click",
+      "https://lr.ptr.moe",
-      "https://red.artemislena.eu",
-      "https://red.ngn.tf",
       "https://reddit.nerdvpn.de",
+      "https://reddit.rtrace.io",
+      "https://redlib.4o1x5.dev",
+      "https://redlib.baczek.me",
       "https://redlib.catsarch.com",
-      "https://redlib.ducks.party",
+      "https://redlib.privacyredirect.com"
-      "https://redlib.kittywi.re",
-      "https://redlib.nadeko.net",
-      "https://redlib.privacy.com.de",
-      "https://redlib.privacyredirect.com",
-      "https://rl.bloat.cat",
-      "https://rl.rootdo.com",
-      "https://safereddit.com"
     ]
   },
   {
@@ -26,21 +20,15 @@
     "test_url": "/r/popular",
     "fallback": "https://redlib.freedit.eu",
     "instances": [
-      "https://l.opnxng.com",
+      "https://eu.safereddit.com",
-      "https://r.darrennathanael.com",
+      "https://libreddit.diffraction.dev",
-      "https://red.arancia.click",
+      "https://lr.ptr.moe",
-      "https://red.artemislena.eu",
-      "https://red.ngn.tf",
       "https://reddit.nerdvpn.de",
+      "https://reddit.rtrace.io",
+      "https://redlib.4o1x5.dev",
+      "https://redlib.baczek.me",
       "https://redlib.catsarch.com",
-      "https://redlib.ducks.party",
+      "https://redlib.privacyredirect.com"
-      "https://redlib.kittywi.re",
-      "https://redlib.nadeko.net",
-      "https://redlib.privacy.com.de",
-      "https://redlib.privacyredirect.com",
-      "https://rl.bloat.cat",
-      "https://rl.rootdo.com",
-      "https://safereddit.com"
     ]
   },
   {
@@ -80,6 +68,7 @@
       "https://ig.opnxng.com",
       "https://proxigram.lunar.icu",
       "https://gram.whatever.social",
+      "https://ig.snine.nl",
       "https://ig.floppa.one",
       "https://proxigram.kyun.li"
     ]
@@ -118,8 +107,11 @@
     "test_url": "/jack/status/20",
     "fallback": "https://nitter.net",
     "instances": [
+      "https://nitter.kuuro.net",
+      "https://nitter.net",
       "https://nitter.poast.org",
-      "https://nitter.privacydev.net",
+      "https://nitter.privacyredirect.com",
+      "https://nitter.tiekoetter.com",
       "https://xcancel.com"
     ]
   },
@@ -185,12 +177,16 @@
     "test_url": "/a/H8M4rcp",
     "fallback": "https://rimgo.projectsegfau.lt",
     "instances": [
-      "https://i.habedieeh.re",
+      "https://i.datuan.dev",
       "https://imgur.010032.xyz",
       "https://imgur.artemislena.eu",
+      "https://imgur.fsky.io",
       "https://imgur.nerdvpn.de",
+      "https://imgur.sudovanilla.org",
+      "https://r.opnxng.com",
       "https://ri.nadeko.net",
       "https://rimgo.4o1x5.dev",
+      "https://rimgo.astrial.org",
       "https://rimgo.bloat.cat",
       "https://rimgo.bus-hit.me",
       "https://rimgo.canine.tools",
@@ -201,11 +197,11 @@
       "https://rimgo.eu.projectsegfau.lt",
       "https://rimgo.frontendfriendly.xyz",
       "https://rimgo.frylo.net",
-      "https://rimgo.gitro.xyz",
       "https://rimgo.hostux.net",
       "https://rimgo.in.projectsegfau.lt",
       "https://rimgo.lunar.icu",
       "https://rimgo.nohost.network",
+      "https://rimgo.perennialte.ch",
       "https://rimgo.privacyredirect.com",
       "https://rimgo.projectsegfau.lt",
       "https://rimgo.pussthecat.org",
@@ -214,7 +210,6 @@
       "https://rimgo.thebunny.zone",
       "https://rimgo.totaldarkness.net",
       "https://rimgo.us.projectsegfau.lt",
-      "https://rimgo.whateveritworks.org",
       "https://rmgur.com"
     ]
   },
@@ -223,25 +218,10 @@
     "test_url": "/search?cookies_disabled=1&q=<%=query%>",
     "fallback": "https://search.sethforprivacy.com",
     "instances": [
-      "https://gowogle.voring.me",
-      "https://s.tokhmi.xyz",
-      "https://search.albony.xyz",
-      "https://search.dr460nf1r3.org",
-      "https://search.nezumi.party",
-      "https://search.notrustverify.ch",
       "https://search.sethforprivacy.com",
       "https://wg.vern.cc",
-      "https://wgl.frail.duckdns.org",
-      "https://whoogle-search--replitcomreside.repl.co",
-      "https://whoogle.datura.network",
-      "https://whoogle.dcs0.hu",
-      "https://whoogle.ftw.lol",
-      "https://whoogle.hostux.net",
-      "https://whoogle.hxvy0.gq",
       "https://whoogle.lunar.icu",
-      "https://whoogle.no-logs.com",
+      "https://whoogle.privacydev.net"
-      "https://whoogle.privacydev.net",
-      "https://whoogle.yepserver.xyz"
     ]
   },
   {
@@ -256,7 +236,6 @@
       "https://searx.mxchange.org",
       "https://searx.nixnet.services",
       "https://searx.roflcopter.fr",
-      "https://searx.ru",
       "https://searx.zapashcanon.fr"
     ]
   },
@@ -266,47 +245,44 @@
     "fallback": "https://searx.be",
     "instances": [
       "https://baresearch.org",
-      "https://kantan.cat",
+      "https://copp.gg",
+      "https://find.xenorio.xyz",
       "https://northboot.xyz",
       "https://opnxng.com",
       "https://paulgo.io",
-      "https://priv.au",
       "https://s.mble.dk",
       "https://search.080609.xyz",
-      "https://search.blitzw.in",
-      "https://search.canine.tools",
       "https://search.catboy.house",
       "https://search.citw.lgbt",
       "https://search.einfachzocken.eu",
-      "https://search.gcomm.ch",
+      "https://search.federicociro.com",
       "https://search.im-in.space",
       "https://search.ipv6s.net",
       "https://search.leptons.xyz",
       "https://search.mdosch.de",
-      "https://search.nadeko.net",
       "https://search.nerdvpn.de",
       "https://search.ononoki.org",
-      "https://search.privacyredirect.com",
-      "https://search.projectsegfau.lt",
-      "https://search.rhscz.eu",
       "https://search.rowie.at",
       "https://search.sapti.me",
       "https://search.url4irl.com",
       "https://searx.ankha.ac",
-      "https://searx.be",
       "https://searx.dresden.network",
-      "https://searx.electroncash.de",
       "https://searx.foobar.vip",
       "https://searx.foss.family",
       "https://searx.namejeff.xyz",
       "https://searx.ox2.fr",
+      "https://searx.perennialte.ch",
       "https://searx.rhscz.eu",
+      "https://searx.stream",
       "https://searx.tiekoetter.com",
+      "https://searx.tuxcloud.net",
+      "https://searxng.deliberate.world",
+      "https://searxng.f24o.zip",
       "https://searxng.hweeren.com",
       "https://searxng.shreven.org",
       "https://searxng.site",
-      "https://searxng.world",
+      "https://seek.fyi",
-      "https://seek.fyi"
+      "https://suche.dasnetzundich.de"
     ]
   },
   {
@@ -317,7 +293,6 @@
       "https://wiki.owo.si",
       "https://wiki.adminforge.de",
       "https://wiki.froth.zone",
-      "https://wiki.slipfox.xyz",
       "https://wikiless.esmailelbob.xyz",
       "https://wikiless.funami.tech",
       "https://wikiless.lunar.icu",
@@ -360,41 +335,6 @@
       "https://cringe.whateveritworks.org"
     ]
   },
-  {
-    "type": "librex",
-    "test_url": "/search.php?q=<%=query%>",
-    "fallback": "https://librex.myroware.eu",
-    "instances": [
-      "https://glass.prpl.wtf",
-      "https://libre-find.online",
-      "https://libre.blitzw.in",
-      "https://librex.nohost.network",
-      "https://librex.uk.to",
-      "https://librey.4o1x5.dev",
-      "https://librey.baczek.me",
-      "https://librey.darkness.services",
-      "https://librey.franklyflawless.org",
-      "https://librey.ix.tc",
-      "https://librey.milivojevic.in.rs",
-      "https://librey.myroware.net",
-      "https://librey.nirn.quest",
-      "https://librey.org",
-      "https://librey.retro-hax.net",
-      "https://lx.benike.me",
-      "https://ly.owo.si",
-      "https://search.ahwx.org",
-      "https://search.davidovski.xyz",
-      "https://search.funami.tech",
-      "https://search.pabloferreiro.es",
-      "https://search.revvy.de",
-      "https://search.seitan-ayoub.lol",
-      "https://search.technicalvoid.dev",
-      "https://search.uwabaki.party",
-      "https://search.zeroish.xyz",
-      "https://search2.ahwx.org",
-      "https://serp.catswords.net"
-    ]
-  },
   {
     "type": "quetre",
     "test_url": "/How-does-the-Z-boson-decay",
@@ -537,6 +477,7 @@
       "https://4get.konakona.moe",
       "https://4get.lunar.icu",
       "https://4get.lvkaszus.pl",
+      "https://4get.perennialte.ch",
       "https://4get.psily.garden",
       "https://4get.seitan-ayoub.lol",
       "https://4get.silly.computer",
@@ -551,33 +492,21 @@
     "test_url": "/search.php?q=<%=query%>",
     "fallback": "https://search.ahwx.org",
     "instances": [
-      "https://glass.prpl.wtf",
-      "https://libre-find.online",
       "https://libre.blitzw.in",
       "https://librex.nohost.network",
-      "https://librex.uk.to",
       "https://librey.4o1x5.dev",
       "https://librey.baczek.me",
       "https://librey.darkness.services",
-      "https://librey.franklyflawless.org",
+      "https://librey.nube-gran.de",
-      "https://librey.ix.tc",
-      "https://librey.milivojevic.in.rs",
-      "https://librey.myroware.net",
-      "https://librey.nirn.quest",
       "https://librey.org",
-      "https://librey.retro-hax.net",
+      "https://librey.sny.sh",
-      "https://lx.benike.me",
       "https://ly.owo.si",
-      "https://search.ahwx.org",
       "https://search.davidovski.xyz",
       "https://search.funami.tech",
-      "https://search.pabloferreiro.es",
+      "https://search.liv.town",
       "https://search.revvy.de",
-      "https://search.seitan-ayoub.lol",
       "https://search.technicalvoid.dev",
       "https://search.uwabaki.party",
-      "https://search.zeroish.xyz",
-      "https://search2.ahwx.org",
       "https://serp.catswords.net"
     ]
   },
@@ -588,8 +517,14 @@
     "instances": [
       "https://bandcamp.lurkmore.com",
       "https://tent.bloat.cat",
+      "https://tent.canine.tools",
       "https://tent.deep-swarm.xyz",
+      "https://tent.lab8.cz",
+      "https://tent.private.coffee",
+      "https://tent.qunn.link",
       "https://tent.sny.sh",
+      "https://tn.dc09.ru",
+      "https://tn.maid.zone",
       "https://tn.vern.cc"
     ]
   }

services/mappings.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"math/rand"
 	"regexp"
+	"strings"
 )
 
 type RegexMapping struct {
@@ -24,13 +25,13 @@ var regexMap = []RegexMapping{
 	},
 	{
 		// Reddit
-		Pattern: regexp.MustCompile(`reddit\.com|libreddit|redlib`),
+		Pattern: regexp.MustCompile(`reddit\.com|libreddit|redlib|teddit`),
-		Targets: []string{"libreddit", "redlib"},
+		Targets: []string{"libreddit", "redlib", "teddit"},
 	},
 	{
 		// Google Search
 		Pattern: regexp.MustCompile(`google\.com|whoogle|searx|searxng`),
-		Targets: []string{"whoogle", "searx", "searxng"},
+		Targets: []string{"whoogle", "searxng"},
 	},
 	{
 		// Instagram
@@ -59,8 +60,8 @@ var regexMap = []RegexMapping{
 	},
 	{
 		// Google Translate
-		Pattern: regexp.MustCompile(`translate\.google\.com|lingva`),
+		Pattern: regexp.MustCompile(`translate\.google\.com|lingva|simplytranslate`),
-		Targets: []string{"lingva"},
+		Targets: []string{"lingva", "simplytranslate"},
 	},
 	{
 		// TikTok
@@ -92,15 +93,47 @@ var regexMap = []RegexMapping{
 		Pattern: regexp.MustCompile(`stackoverflow\.com|anonymousoverflow`),
 		Targets: []string{"anonymousoverflow"},
 	},
+	{
+		// Genius
+		Pattern: regexp.MustCompile(`genius\.com|dumb`),
+		Targets: []string{"dumb"},
+	},
+	{
+		// 4get
+		// Note: Could be used for redirecting other search engine
+		// requests, but would need special handling
+		Pattern: regexp.MustCompile("4get"),
+		Targets: []string{"4get"},
+	},
+	{
+		// LibreY
+		// Note: Could be used for redirecting other search engine
+		// requests, but would need special handling
+		Pattern: regexp.MustCompile("librex|librey"),
+		Targets: []string{"librey"},
+	},
+	{
+		// Tent
+		// Note: This is a Bandcamp alternative, but the endpoints are
+		// completely different than Bandcamp, so 1-to-1 mapping of URLs
+		// is not possible without some additional work
+		Pattern: regexp.MustCompile("tent"),
+		Targets: []string{"tent"},
+	},
 }
 
 func MatchRequest(service string) (string, error) {
+
 	for _, mapping := range regexMap {
 		hasMatch := mapping.Pattern.MatchString(service)
 		if !hasMatch {
 			continue
 		}
 
+		if !strings.Contains(service, ".") {
+			return service, nil
+		}
+
 		index := rand.Intn(len(mapping.Targets))
 		value := mapping.Targets[index]
 		return value, nil

services/services.go

@@ -13,7 +13,7 @@ var (
 )
 
 const (
-	baseRepoLink = "https://git.sr.ht/~benbusby/farside/blob/main/"
+	baseRepoLink = "https://raw.githubusercontent.com/benbusby/farside/refs/heads/main/"
 
 	noCFServicesJSON = "services.json"
 	fullServicesJSON = "services-full.json"
@@ -26,11 +26,6 @@ type Service struct {
 	Instances []string `json:"instances"`
 }
 
-func ingestServicesList(servicesBytes []byte) error {
-	err := json.Unmarshal(servicesBytes, &ServiceList)
-	return err
-}
-
 func GetServicesFileName() string {
 	cloudflareEnabled := false
 
@@ -47,7 +42,6 @@ func GetServicesFileName() string {
 	return serviceJSON
 }
 
-
 func FetchServicesFile(serviceJSON string) ([]byte, error) {
 	resp, err := http.Get(baseRepoLink + serviceJSON)
 	if err != nil {
@@ -79,7 +73,7 @@ func InitializeServices() error {
 		}
 	}
 
-	err = ingestServicesList(fileBytes)
+	err = json.Unmarshal(fileBytes, &ServiceList)
 	if err != nil {
 		return err
 	}