Merge branch 'main' into main

This commit is contained in:
Jason Clark 2022-09-27 00:26:49 -07:00 committed by GitHub
commit 7b54864504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 72 deletions

View File

@ -37,19 +37,22 @@ jobs:
# ==============================================================
# Bibliogram update
# NOTE: Bibliogram has been discontinued and the official instance
# at bibliogram.art is no longer around. Unless a new "official"
# instance pops up, Bibliogram will likely be removed from farside
# ==============================================================
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
#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
#apply_update
# ==============================================================
# searx update

View File

@ -30,6 +30,7 @@ available public instances for a particular service, while also helping to
distribute traffic more evenly across all instances and avoid performance
bottlenecks and rate-limiting.
## Heroku deploy
To load custom services, you must paste a base64 encoded json into the FARSIDE_SERVICES_JSON_DATA field
you can encode your json at https://www.base64encode.org
@ -51,6 +52,10 @@ Run as a service
systemctl start farside
systemctl enable farside
```
=======
Farside also integrates smoothly with basic redirector extensions in most
browsers. For an simple example setup,
[refer to the wiki](https://github.com/benbusby/farside/wiki/Browser-Extension).
## Demo
@ -89,11 +94,6 @@ For example:
<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>

View File

@ -44,8 +44,10 @@
"https://rdt.trom.tf",
"https://reddit.lol",
"https://snoo.ioens.is",
"https://td.vern.cc",
"https://tedd.it",
"https://teddit.adminforge.de",
"https://teddit.artemislena.eu",
"https://teddit.bus-hit.me",
"https://teddit.domain.glass",
"https://teddit.encrypted-data.xyz",
@ -53,64 +55,37 @@
"https://teddit.garudalinux.org",
"https://teddit.ggc-project.de",
"https://teddit.httpjames.space",
"https://teddit.manasiwibi.com",
"https://teddit.namazso.eu",
"https://teddit.nautolan.racing",
"https://teddit.net",
"https://teddit.pussthecat.org",
"https://teddit.rawbit.ninja",
"https://teddit.sethforprivacy.com",
"https://teddit.tinfoil-hat.net",
"https://teddit.tokhmi.xyz",
"https://teddit.totaldarkness.net",
"https://teddit.zaggy.nl"
"https://teddit.zaggy.nl",
"https://wiki.privacytools.io"
]
},
{
"type": "bibliogram",
"test_url": "/u/officialrickastley",
"fallback": "https://bibliogram.art",
"test_url": "/p/Ch2WRmiLMjj",
"fallback": "https://bibliogram.1d4.us",
"instances": [
"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://insta.tromdienste.de"
"https://ig.tokhmi.xyz"
]
},
{
"type": "invidious",
"test_url": "/watch?v=eBGIQ7ZuuiU",
"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",
"https://invidious.sethforprivacy.com",
"https://invidious.slipfox.xyz",
"https://invidious.snopyta.org",
"https://invidious.tiekoetter.com",
"https://invidious.weblibre.org",
"https://vid.puffyan.us",
"https://y.com.sb",
"https://yewtu.be",
"https://youtube.076.ne.jp",
"https://yt.artemislena.eu"
]
"instances": []
},
{
"type": "piped",
@ -175,7 +150,10 @@
"https://scribe.citizen4.eu",
"https://scribe.bus-hit.me",
"https://scribe.froth.zone",
"https://scribe.esmailelbob.xyz"
"https://scribe.esmailelbob.xyz",
"https://scribe.privacydev.net",
"https://scribe.rawbit.ninja",
"https://sc.vern.cc"
]
},
{
@ -184,9 +162,10 @@
"fallback": "https://simplytranslate.org",
"instances": [
"https://simplytranslate.esmailelbob.xyz",
"https://simplytranslate.manerakai.com",
"https://simplytranslate.org",
"https://simplytranslate.pussthecat.org",
"https://st.manerakai.com",
"https://st.odyssey346.dev",
"https://st.privacydev.net",
"https://st.tokhmi.xyz",
"https://tl.vern.cc",
@ -248,18 +227,13 @@
"test_url": "/search?q=<%=query%>",
"fallback": "https://searx.be",
"instances": [
"https://anon.sx",
"https://dynabyte.ca",
"https://northboot.xyz",
"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.xyz",
"https://www.webrats.xyz"
]
},
@ -273,6 +247,7 @@
"https://etsi.me",
"https://jackgoss.xyz",
"https://northboot.xyz",
"https://notsearch.uk",
"https://opnxng.com",
"https://paulgo.io",
"https://priv.au",
@ -282,23 +257,30 @@
"https://search.0relay.com",
"https://search.bus-hit.me",
"https://search.chemicals-in-the-water.eu",
"https://search.cronobox.one",
"https://search.disroot.org",
"https://search.gcomm.ch",
"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.rhscze.cf",
"https://search.rowie.at",
"https://search.sapti.me",
"https://search.smnz.de",
"https://search.teamriverbubbles.com",
"https://search.unlocked.link",
"https://search.zzls.xyz",
"https://searx.baczek.me",
"https://searx.be",
"https://searx.becomesovran.com",
"https://searx.chocoflan.net",
"https://searx.ebnar.xyz",
"https://searx.ericaftereric.top",
"https://searx.fi",
"https://searx.fmac.xyz",
"https://searx.kujonello.cf",
"https://searx.mha.fi",
"https://searx.mistli.net",
"https://searx.namejeff.xyz",
@ -307,14 +289,12 @@
"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://sh0.it",
"https://swag.pw",
"https://www.higgssearch.com",
"https://trydex.tk/searxng",
"https://www.webrats.xyz",
"https://xcxc.ml",
"https://xo.wtf"
@ -326,15 +306,19 @@
"fallback": "https://wikiless.org",
"instances": [
"https://wiki.604kph.xyz",
"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",
"https://wikiless.northboot.xyz",
"https://wikiless.org",
"https://wikiless.rawbit.ninja",
"https://wikiless.sethforprivacy.com",
"https://wikiless.tiekoetter.com"
"https://wikiless.tiekoetter.com",
"https://wl.vern.cc"
]
},
{

View File

@ -42,19 +42,13 @@
},
{
"type": "bibliogram",
"test_url": "/u/officialrickastley",
"fallback": "https://bibliogram.art",
"test_url": "/p/Ch2WRmiLMjj/",
"fallback": "https://bibliogram.1d4.us",
"instances": [
"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.tromdienste.de"
"https://ig.beparanoid.de"
]
},
{