mirrors/farside
1
0
Fork 0
mirror of https://github.com/benbusby/farside.git synced 2025-06-08 02:16:36 +00:00
Code Wiki Activity

Merge branch 'main' into main

Browse source
This commit is contained in:
Jason Clark 2022-08-09 14:08:52 -07:00 • committed by GitHub
commit 36d5b253a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 183 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

46
.github/workflows/update-instances.yml vendored
View file

@ -27,31 +27,6 @@ jobs:
sed -i 's/\/"/"/g' services-full.json sed -i 's/\/"/"/g' services-full.json
} }
function remove_cf_instances() {
rm 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")
if [[ "$ns" == *"cloudflare"* ]]; then
echo "\"$domain\" using cloudflare, 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 out.json
}
# ============================================================== # ==============================================================
# Git config # Git config
# ============================================================== # ==============================================================
@ -60,6 +35,22 @@ jobs:
git remote set-url origin git@github.com:benbusby/farside.git git remote set-url origin git@github.com:benbusby/farside.git
git checkout main 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 # searx update
# ============================================================== # ==============================================================
@ -198,11 +189,6 @@ jobs:
# TODO: Update instances for other services # TODO: Update instances for other services
# ============================================================== # ==============================================================
# ==============================================================
# Remove cloudflare instances
# ==============================================================
remove_cf_instances
# ============================================================== # ==============================================================
# Push changes # Push changes
# ============================================================== # ==============================================================

130
README.md
View file

@ -1,11 +1,26 @@
![Farside](img/farside.svg) <div align="center" style="margin-bottom: 10px;">
<img src="https://benbusby.com/assets/images/farside.svg" alt="Farside">
</div>
<br>
<div align="center">
[![Latest Release](https://img.shields.io/github/v/release/benbusby/farside?label=Release)](https://github.com/benbusby/farside/releases) [![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) [![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) [![Elixir CI](https://github.com/benbusby/privacy-revolver/actions/workflows/elixir.yml/badge.svg)](https://github.com/benbusby/privacy-revolver/actions/workflows/elixir.yml)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
<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. A redirecting service for FOSS alternative frontends.
[Farside](https://farside.link) provides links that automatically redirect to [Farside](https://farside.link) provides links that automatically redirect to
@ -43,23 +58,80 @@ Farside's links work with the following structure: `farside.link/<service>/<path
For example: For example:
| Service | Page | Farside Link | <table>
| -- | -- | -- | <tr>
| [Libreddit](https://github.com/spikecodes/libreddit) | /r/popular | https://farside.link/libreddit/r/popular <td>Service</td>
| [Teddit](https://codeberg.org/teddit/teddit) | /r/popular | https://farside.link/teddit/r/popular <td>Page</td>
| [Nitter](https://github.com/zedeus/nitter) | User Profile | https://farside.link/nitter/josevalim <td>Farside Link</td>
| [Invidious](https://github.com/iv-org/invidious) | Home Page | https://farside.link/invidious </tr>
| [Piped](https://github.com/TeamPiped/Piped) | Video Page | https://farside.link/piped/watch?v=eBGIQ7ZuuiU <tr>
| [Bibliogram](https://sr.ht/~cadence/bibliogram/) | User Profile | https://farside.link/bibliogram/u/kbdfans <td><a href="https://github.com/spikecodes/libreddit">Libreddit</a></td>
| [Whoogle](https://github.com/benbusby/whoogle-search) | Search "Elixir" | https://farside.link/whoogle/search?q=elixir&lang_interface=en <td>/r/popular</td>
| [SearX](https://github.com/searx/searx) | Search "Redis" | https://farside.link/searx/search?q=redis <td><a href="https://farside.link/libreddit/r/popular">https://farside.link/libreddit/r/popular</a></td>
| [SearXNG](https://github.com/searxng/searxng) | Search "EFF" | https://farside.link/searxng/search?q=EFF </tr>
| [SimplyTranslate](https://git.sr.ht/~metalune/simplytranslate_web) | Translate "hola" | https://farside.link/simplytranslate/?engine=google&text=hola <tr>
| [Lingva](https://github.com/TheDavidDelta/lingva-translate) | Translate "bonjour" | https://farside.link/lingva/auto/en/bonjour <td><a href="https://codeberg.org/teddit/teddit">Teddit</a></td>
| [Rimgo](https://codeberg.org/video-prize-ranch/rimgo) | View photo album | https://farside.link/rimgo/a/H8M4rcp <td>/r/popular</td>
| [Scribe](https://sr.ht/~edwardloveall/scribe/) | View Medium post | https://farside.link/scribe/@ftrain/big-data-small-effort-b62607a43a8c <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><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><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><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><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><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><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><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><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><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><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><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>
<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: Farside also accepts URLs to "parent" services, and will redirect to an appropriate front end service, for example:
@ -138,6 +210,7 @@ goes against what Farside is trying to solve. Use at your own discretion.
### Environment Variables ### Environment Variables
| Name | Purpose | | Name | Purpose |
| -- | -- | | -- | -- |
| FARSIDE_TEST | If enabled, bypasses the instance availability check and adds all instances to the pool. | | FARSIDE_TEST | If enabled, bypasses the instance availability check and adds all instances to the pool. |
@ -145,3 +218,26 @@ goes against what Farside is trying to solve. Use at your own discretion.
| FARSIDE_TIMEOUT | The default timeout to wait for the url (default: `8000`) | | FARSIDE_TIMEOUT | The default timeout to wait for the url (default: `8000`) |
| FARSIDE_SERVICES_JSON | The "services" JSON file to use for selecting instances (default: `services.json`) | | FARSIDE_SERVICES_JSON | The "services" JSON file to use for selecting instances (default: `services.json`) |
| FARSIDE_SERVICES_JSON_DATA | The "services" JSON file to use for selecting instances base64 encoded | | FARSIDE_SERVICES_JSON_DATA | The "services" JSON file to use for selecting instances base64 encoded |
<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>

2
index.eex
View file

@ -33,7 +33,7 @@
<body> <body>
<div id="parent-div"> <div id="parent-div">
<div id="child-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> <hr>
<h3>Last synced <%= DateTime.truncate(last_updated, :second) %> UTC</h2> <h3>Last synced <%= DateTime.truncate(last_updated, :second) %> UTC</h2>
<div> <div>

4
lib/farside.ex
View file

@ -15,7 +15,7 @@ defmodule Farside do
@gtranslate_regex ~r/translate.google.com|lingva/ @gtranslate_regex ~r/translate.google.com|lingva/
@tiktok_regex ~r/tiktok.com|proxitok/ @tiktok_regex ~r/tiktok.com|proxitok/
@imdb_regex ~r/imdb.com|libremdb/ @imdb_regex ~r/imdb.com|libremdb/
@quora_regex ~r/quora.com|querte/ @quora_regex ~r/quora.com|quetre/
@parent_services %{ @parent_services %{
@youtube_regex => ["invidious", "piped"], @youtube_regex => ["invidious", "piped"],
@ -29,7 +29,7 @@ defmodule Farside do
@gtranslate_regex => ["lingva"], @gtranslate_regex => ["lingva"],
@tiktok_regex => ["proxitok"], @tiktok_regex => ["proxitok"],
@imdb_regex => ["libremdb"], @imdb_regex => ["libremdb"],
@quora_regex => ["querte"] @quora_regex => ["quetre"]
} }
alias Farside.LastUpdated alias Farside.LastUpdated

45
services-full.json
View file

@ -69,13 +69,19 @@
"test_url": "/u/officialrickastley", "test_url": "/u/officialrickastley",
"fallback": "https://bibliogram.art", "fallback": "https://bibliogram.art",
"instances": [ "instances": [
"https://bibliogram.art", "https://bib.actionsack.com",
"https://bibliogram.snopyta.org",
"https://bibliogram.pussthecat.org",
"https://bibliogram.1d4.us", "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://insta.trom.tf",
"https://bibliogram.hamster.dance", "https://insta.tromdienste.de"
"https://bib.actionsack.com"
] ]
}, },
{ {
@ -132,13 +138,11 @@
"https://nitter.kavin.rocks", "https://nitter.kavin.rocks",
"https://nitter.vxempire.xyz", "https://nitter.vxempire.xyz",
"https://nitter.unixfox.eu", "https://nitter.unixfox.eu",
"https://nitter.domain.glass",
"https://nitter.eu", "https://nitter.eu",
"https://nitter.namazso.eu", "https://nitter.namazso.eu",
"https://nitter.mailstation.de", "https://nitter.mailstation.de",
"https://nitter.actionsack.com", "https://n.actionsack.com",
"https://nitter.cattube.org", "https://nitter.cattube.org",
"https://birdsite.xanny.family",
"https://nitter.hu", "https://nitter.hu",
"https://nitter.exonip.de", "https://nitter.exonip.de",
"https://twitr.gq", "https://twitr.gq",
@ -149,7 +153,6 @@
"https://nitter.grimneko.de", "https://nitter.grimneko.de",
"https://nitter.koyu.space", "https://nitter.koyu.space",
"https://nitter.ir", "https://nitter.ir",
"https://nitter.autarkic.org",
"https://n.0x0.st", "https://n.0x0.st",
"https://n.hyperborea.cloud", "https://n.hyperborea.cloud",
"https://nitter.ca", "https://nitter.ca",
@ -158,7 +161,8 @@
"https://nitter.bus-hit.me", "https://nitter.bus-hit.me",
"https://nttr.stream", "https://nttr.stream",
"https://de.nttr.stream", "https://de.nttr.stream",
"https://n.l5.ca" "https://n.l5.ca",
"https://unofficialbird.com"
] ]
}, },
{ {
@ -170,7 +174,8 @@
"https://scribe.nixnet.services", "https://scribe.nixnet.services",
"https://scribe.citizen4.eu", "https://scribe.citizen4.eu",
"https://scribe.bus-hit.me", "https://scribe.bus-hit.me",
"https://scribe.froth.zone" "https://scribe.froth.zone",
"https://scribe.esmailelbob.xyz"
] ]
}, },
{ {
@ -243,17 +248,17 @@
"test_url": "/search?q=<%=query%>", "test_url": "/search?q=<%=query%>",
"fallback": "https://searx.be", "fallback": "https://searx.be",
"instances": [ "instances": [
"https://anon.sx",
"https://dynabyte.ca", "https://dynabyte.ca",
"https://northboot.xyz",
"https://search.neet.works", "https://search.neet.works",
"https://searx.divided-by-zero.eu", "https://searx.divided-by-zero.eu",
"https://searx.gnu.style", "https://searx.gnu.style",
"https://searx.rasp.fr",
"https://searx.ru", "https://searx.ru",
"https://searx.sp-codes.de", "https://searx.sp-codes.de",
"https://searx.stuehieyr.com", "https://searx.stuehieyr.com",
"https://searx.tuxcloud.net", "https://searx.tuxcloud.net",
"https://searx.tyil.nl", "https://searx.tyil.nl",
"https://searx.webheberg.info",
"https://searx.xyz", "https://searx.xyz",
"https://www.webrats.xyz" "https://www.webrats.xyz"
] ]
@ -274,7 +279,7 @@
"https://s.frlt.one", "https://s.frlt.one",
"https://s.zhaocloud.net", "https://s.zhaocloud.net",
"https://saber.tk", "https://saber.tk",
"https://search.ashs.club", "https://search.0relay.com",
"https://search.bus-hit.me", "https://search.bus-hit.me",
"https://search.chemicals-in-the-water.eu", "https://search.chemicals-in-the-water.eu",
"https://search.gcomm.ch", "https://search.gcomm.ch",
@ -282,7 +287,6 @@
"https://search.neet.works", "https://search.neet.works",
"https://search.ononoki.org", "https://search.ononoki.org",
"https://search.privacyguides.net", "https://search.privacyguides.net",
"https://search.projectsegfau.lt",
"https://search.rabbit-company.com", "https://search.rabbit-company.com",
"https://search.sapti.me", "https://search.sapti.me",
"https://search.teamriverbubbles.com", "https://search.teamriverbubbles.com",
@ -294,6 +298,7 @@
"https://searx.ebnar.xyz", "https://searx.ebnar.xyz",
"https://searx.ericaftereric.top", "https://searx.ericaftereric.top",
"https://searx.fmac.xyz", "https://searx.fmac.xyz",
"https://searx.kujonello.cf",
"https://searx.mha.fi", "https://searx.mha.fi",
"https://searx.mistli.net", "https://searx.mistli.net",
"https://searx.namejeff.xyz", "https://searx.namejeff.xyz",
@ -303,14 +308,16 @@
"https://searx.slipfox.xyz/searx", "https://searx.slipfox.xyz/searx",
"https://searx.tiekoetter.com", "https://searx.tiekoetter.com",
"https://searx.vimproved.me", "https://searx.vimproved.me",
"https://searx.youshitsune.me",
"https://searx.zcyph.cc", "https://searx.zcyph.cc",
"https://searxng.tordenskjold.de", "https://searxng.tordenskjold.de",
"https://searxng.zackptg5.com", "https://searxng.zackptg5.com",
"https://serx.ml", "https://serx.ml",
"https://sh0.it",
"https://swag.pw", "https://swag.pw",
"https://www.higgssearch.com",
"https://www.webrats.xyz", "https://www.webrats.xyz",
"https://xcxc.ml" "https://xcxc.ml",
"https://xo.wtf"
] ]
}, },
{ {
@ -365,7 +372,7 @@
] ]
}, },
{ {
"type": "querte", "type": "quetre",
"test_url": "/How-does-the-Z-boson-decay", "test_url": "/How-does-the-Z-boson-decay",
"fallback": "https://quetre.herokuapp.com", "fallback": "https://quetre.herokuapp.com",
"instances": [ "instances": [
@ -381,7 +388,7 @@
}, },
{ {
"type": "libremdb", "type": "libremdb",
"test_url": "/title/tt0133093/", "test_url": "/title/tt0133093",
"fallback": "https://libremdb.herokuapp.com", "fallback": "https://libremdb.herokuapp.com",
"instances": [ "instances": [
"https://libremdb.herokuapp.com", "https://libremdb.herokuapp.com",

33
services.json
View file

@ -12,9 +12,9 @@
"https://reddit.artemislena.eu", "https://reddit.artemislena.eu",
"https://libreddit.some-things.org", "https://libreddit.some-things.org",
"https://reddit.stuehieyr.com", "https://reddit.stuehieyr.com",
"https://lr.mint.lgbt",
"https://libreddit.igna.rocks", "https://libreddit.igna.rocks",
"https://libreddit.autarkic.org", "https://libreddit.autarkic.org",
"https://libreddit.flux.industries",
"https://libreddit.de", "https://libreddit.de",
"https://libreddit.bus-hit.me" "https://libreddit.bus-hit.me"
] ]
@ -45,12 +45,16 @@
"test_url": "/u/officialrickastley", "test_url": "/u/officialrickastley",
"fallback": "https://bibliogram.art", "fallback": "https://bibliogram.art",
"instances": [ "instances": [
"https://bibliogram.art",
"https://bibliogram.snopyta.org",
"https://bibliogram.pussthecat.org",
"https://bibliogram.1d4.us", "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://insta.trom.tf", "https://insta.trom.tf",
"https://bibliogram.hamster.dance" "https://insta.tromdienste.de"
] ]
}, },
{ {
@ -103,15 +107,16 @@
"https://nitter.cattube.org", "https://nitter.cattube.org",
"https://twitr.gq", "https://twitr.gq",
"https://bird.trom.tf", "https://bird.trom.tf",
"https://nitter.it",
"https://nitter.grimneko.de", "https://nitter.grimneko.de",
"https://nitter.autarkic.org",
"https://n.0x0.st", "https://n.0x0.st",
"https://n.hyperborea.cloud", "https://n.hyperborea.cloud",
"https://nitter.ca", "https://nitter.ca",
"https://twitter.076.ne.jp", "https://twitter.076.ne.jp",
"https://nitter.sethforprivacy.com", "https://nitter.sethforprivacy.com",
"https://nitter.bus-hit.me", "https://nitter.bus-hit.me",
"https://n.l5.ca" "https://n.l5.ca",
"https://unofficialbird.com"
] ]
}, },
{ {
@ -123,7 +128,8 @@
"https://scribe.nixnet.services", "https://scribe.nixnet.services",
"https://scribe.citizen4.eu", "https://scribe.citizen4.eu",
"https://scribe.bus-hit.me", "https://scribe.bus-hit.me",
"https://scribe.froth.zone" "https://scribe.froth.zone",
"https://scribe.esmailelbob.xyz"
] ]
}, },
{ {
@ -186,14 +192,13 @@
"test_url": "/search?q=<%=query%>", "test_url": "/search?q=<%=query%>",
"fallback": "https://searx.be", "fallback": "https://searx.be",
"instances": [ "instances": [
"https://anon.sx",
"https://dynabyte.ca", "https://dynabyte.ca",
"https://search.neet.works", "https://search.neet.works",
"https://searx.divided-by-zero.eu", "https://searx.divided-by-zero.eu",
"https://searx.rasp.fr",
"https://searx.ru", "https://searx.ru",
"https://searx.sp-codes.de", "https://searx.sp-codes.de",
"https://searx.stuehieyr.com", "https://searx.stuehieyr.com",
"https://searx.tuxcloud.net",
"https://searx.tyil.nl", "https://searx.tyil.nl",
"https://searx.webheberg.info", "https://searx.webheberg.info",
"https://searx.xyz" "https://searx.xyz"
@ -207,10 +212,10 @@
"https://darmarit.org/searx", "https://darmarit.org/searx",
"https://de.xcxc.ml", "https://de.xcxc.ml",
"https://jackgoss.xyz", "https://jackgoss.xyz",
"https://northboot.xyz",
"https://priv.au", "https://priv.au",
"https://s.zhaocloud.net", "https://s.zhaocloud.net",
"https://saber.tk", "https://saber.tk",
"https://search.0relay.com",
"https://search.ashs.club", "https://search.ashs.club",
"https://search.bus-hit.me", "https://search.bus-hit.me",
"https://search.chemicals-in-the-water.eu", "https://search.chemicals-in-the-water.eu",
@ -227,13 +232,13 @@
"https://searx.ebnar.xyz", "https://searx.ebnar.xyz",
"https://searx.ericaftereric.top", "https://searx.ericaftereric.top",
"https://searx.fmac.xyz", "https://searx.fmac.xyz",
"https://searx.mha.fi",
"https://searx.mistli.net", "https://searx.mistli.net",
"https://searx.priv.pw", "https://searx.priv.pw",
"https://searx.prvcy.eu", "https://searx.prvcy.eu",
"https://searx.sev.monster", "https://searx.sev.monster",
"https://searx.slipfox.xyz/searx", "https://searx.slipfox.xyz/searx",
"https://searx.tiekoetter.com", "https://searx.tiekoetter.com",
"https://searx.youshitsune.me",
"https://searxng.tordenskjold.de", "https://searxng.tordenskjold.de",
"https://serx.ml", "https://serx.ml",
"https://swag.pw", "https://swag.pw",
@ -288,7 +293,7 @@
] ]
}, },
{ {
"type": "querte", "type": "quetre",
"test_url": "/How-does-the-Z-boson-decay", "test_url": "/How-does-the-Z-boson-decay",
"fallback": "https://quetre.herokuapp.com", "fallback": "https://quetre.herokuapp.com",
"instances": [ "instances": [
@ -303,7 +308,7 @@
}, },
{ {
"type": "libremdb", "type": "libremdb",
"test_url": "/title/tt0133093/", "test_url": "/title/tt0133093",
"fallback": "https://libremdb.herokuapp.com", "fallback": "https://libremdb.herokuapp.com",
"instances": [ "instances": [
"https://libremdb.herokuapp.com", "https://libremdb.herokuapp.com",

9
tools/un-cloudflare.sh
View file

@ -7,9 +7,11 @@ file="services-full.json"
while read -r line; do while read -r line; do
if [[ "$line" == "\"https://"* ]]; then if [[ "$line" == "\"https://"* ]]; then
domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//") domain=$(echo "$line" | sed -e "s/^\"https:\/\///" -e "s/\",//" -e "s/\"//")
ns=$(dig ns "$domain") ns=$(dig ns "$domain" || true)
if [[ "$ns" == *"cloudflare"* ]]; then if [[ "$ns" == *"cloudflare"* ]]; then
echo "\"$domain\" using cloudflare, skipping..." echo "\"$domain\" using cloudflare, skipping..."
elif [[ "$ns" != *"NOERROR"* ]]; then
echo "Unable to verify records for \"$domain\", skipping..."
else else
echo "$line" >> out.json echo "$line" >> out.json
fi fi
@ -19,8 +21,7 @@ while read -r line; do
done <$file done <$file
# Remove any trailing commas from new instance lists # 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 cat out.json | jq --indent 2 . > services.json
rm out.json rm -f out.json