From 8bc3aef15586d1fb51566364a5aec2a0faf9cb55 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sun, 24 Nov 2024 22:43:30 -0300 Subject: [PATCH] delete old abandoned clients from lists, add yakihonne for handling microblogs. --- clients.go | 53 +++++++++++++++++++++++--------------------------- homepage.templ | 30 ++++++++++++++-------------- justfile | 6 +++--- 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/clients.go b/clients.go index a880671..2604cd5 100644 --- a/clients.go +++ b/clients.go @@ -19,39 +19,34 @@ var ( nosta = ClientReference{ID: "nosta", Name: "Nosta", Base: "https://nosta.me/{code}", Platform: "web"} snort = ClientReference{ID: "snort", Name: "Snort", Base: "https://snort.social/{code}", Platform: "web"} - satellite = ClientReference{ID: "satellite", Name: "Satellite", Base: "https://satellite.earth/@{code}", Platform: "web"} primalWeb = ClientReference{ID: "primal", Name: "Primal", Base: "https://primal.net/e/{code}", Platform: "web"} nostrudel = ClientReference{ID: "nostrudel", Name: "Nostrudel", Base: "https://nostrudel.ninja/#/n/{code}", Platform: "web"} nostter = ClientReference{ID: "nostter", Name: "Nostter", Base: "https://nostter.app/{code}", Platform: "web"} nostterRelay = ClientReference{ID: "nostter", Name: "Nostter", Base: "https://nostter.app/relays/{code}", Platform: "web"} - iris = ClientReference{ID: "iris", Name: "Iris", Base: "https://iris.to/{code}", Platform: "web"} coracle = ClientReference{ID: "coracle", Name: "Coracle", Base: "https://coracle.social/{code}", Platform: "web"} coracleRelay = ClientReference{ID: "coracle", Name: "Coracle", Base: "https://coracle.social/relays/{code}", Platform: "web"} zapStream = ClientReference{ID: "zap.stream", Name: "zap.stream", Base: "https://zap.stream/{code}", Platform: "web"} nostrrrRelay = ClientReference{ID: "nostrrr", Name: "Nostrrr", Base: "https://nostrrr.com/relay/{code}", Platform: "web"} nostrrrProfile = ClientReference{ID: "nostrrr", Name: "Nostrrr", Base: "https://nostrrr.com/p/{code}", Platform: "web"} - flockstr = ClientReference{ID: "flockstr", Name: "Flockstr", Base: "https://www.flockstr.com/event/{code}", Platform: "web"} - yakihonne = ClientReference{ID: "yakihonne", Name: "YakiHonne", Base: "https://yakihonne.com/article/{code}", Platform: "web"} + yakihonne = ClientReference{ID: "yakihonne", Name: "YakiHonne", Base: "https://yakihonne.com/{code}", Platform: "web"} habla = ClientReference{ID: "habla", Name: "Habla", Base: "https://habla.news/a/{code}", Platform: "web"} highlighter = ClientReference{ID: "highlighter", Name: "Highlighter", Base: "https://highlighter.com/a/{code}", Platform: "web"} notestack = ClientReference{ID: "notestack", Name: "Notestack", Base: "https://notestack.com/{code}", Platform: "web"} - yanaAndroid = ClientReference{ID: "yana", Name: "Yana", Base: "intent:{code}#Intent;scheme=nostr;package=yana.nostr;end`;", Platform: "android"} - springAndroid = ClientReference{ID: "spring", Name: "Spring", Base: "intent:{code}#Intent;scheme=nostr;package=com.nostr.universe;end`;", Platform: "android"} - amethyst = ClientReference{ID: "amethyst", Name: "Amethyst", Base: "intent:{code}#Intent;scheme=nostr;package=com.vitorpamplona.amethyst;end`;", Platform: "android"} - freeFromAndroid = ClientReference{ID: "freefrom", Name: "FreeFrom", Base: "intent:{code}#Intent;scheme=nostr;package=com.freefrom;end`;", Platform: "android"} - currentAndroid = ClientReference{ID: "current", Name: "Current", Base: "intent:{code}#Intent;scheme=nostr;package=io.getcurrent.current;end`;", Platform: "android"} - plebstrAndroid = ClientReference{ID: "plebstr", Name: "Plebstr", Base: "intent:{code}#Intent;scheme=nostr;package=com.plebstr.client;end`;", Platform: "android"} - voyage = ClientReference{ID: "voyage", Name: "Voyage", Base: "intent:{code}#Intent;scheme=nostr;package=com.dluvian.voyage;end`;", Platform: "android"} + voyage = ClientReference{ID: "voyage", Name: "Voyage", Base: "intent:{code}#Intent;scheme=nostr;package=com.dluvian.voyage;end`;", Platform: "android"} + yakihonneAndroid = ClientReference{ID: "yakihonne", Name: "Yakihonne", Base: "intent:{code}#Intent;scheme=nostr;package=com.yakihonne.yakihonne;end`;", Platform: "android"} + freeFromAndroid = ClientReference{ID: "freefrom", Name: "FreeFrom", Base: "intent:{code}#Intent;scheme=nostr;package=com.freefrom;end`;", Platform: "android"} + yanaAndroid = ClientReference{ID: "yana", Name: "Yana", Base: "intent:{code}#Intent;scheme=nostr;package=yana.nostr;end`;", Platform: "android"} + amethyst = ClientReference{ID: "amethyst", Name: "Amethyst", Base: "intent:{code}#Intent;scheme=nostr;package=com.vitorpamplona.amethyst;end`;", Platform: "android"} - nos = ClientReference{ID: "nos", Name: "Nos", Base: "nos:{code}", Platform: "ios"} - damus = ClientReference{ID: "damus", Name: "Damus", Base: "damus:{code}", Platform: "ios"} - nostur = ClientReference{ID: "nostur", Name: "Nostur", Base: "nostur:{code}", Platform: "ios"} - primalIOS = ClientReference{ID: "primal", Name: "Primal", Base: "primal:{code}", Platform: "ios"} - freeFromIOS = ClientReference{ID: "freefrom", Name: "FreeFrom", Base: "freefrom:{code}", Platform: "ios"} - plebstrIOS = ClientReference{ID: "plebstr", Name: "Plebstr", Base: "plebstr:{code}", Platform: "ios"} + nos = ClientReference{ID: "nos", Name: "Nos", Base: "nos:{code}", Platform: "ios"} + damus = ClientReference{ID: "damus", Name: "Damus", Base: "damus:{code}", Platform: "ios"} + nostur = ClientReference{ID: "nostur", Name: "Nostur", Base: "nostur:{code}", Platform: "ios"} + primalIOS = ClientReference{ID: "primal", Name: "Primal", Base: "primal:{code}", Platform: "ios"} + freeFromIOS = ClientReference{ID: "freefrom", Name: "FreeFrom", Base: "freefrom:{code}", Platform: "ios"} + yakihonneIOS = ClientReference{ID: "yakihonne", Name: "Yakihonne", Base: "yakihhone:{code}", Platform: "ios"} wikistr = ClientReference{ID: "wikistr", Name: "Wikistr", Base: "https://Wikistr.com/{handle}*{authorPubkey}", Platform: "web"} wikifreedia = ClientReference{ID: "wikifreedia", Name: "Wikifreedia", Base: "https://wikifreedia.xyz/{handle}/{npub}", Platform: "web"} @@ -72,28 +67,28 @@ func generateClientList( case 1, 6: clients = []ClientReference{ native, - coracle, snort, nostter, nostrudel, primalWeb, satellite, iris, - nos, damus, nostur, primalIOS, freeFromIOS, plebstrIOS, - yanaAndroid, springAndroid, amethyst, currentAndroid, plebstrAndroid, freeFromAndroid, voyage, + coracle, snort, nostter, nostrudel, primalWeb, + damus, nostur, freeFromIOS, yakihonneIOS, nos, primalIOS, + voyage, yakihonneAndroid, freeFromAndroid, yanaAndroid, amethyst, } case 0: clients = []ClientReference{ native, nostrrrProfile, nosta, coracle, snort, nostter, nostrudel, primalWeb, - satellite, iris, nos, damus, nostur, primalIOS, freeFromIOS, plebstrIOS, - yanaAndroid, springAndroid, amethyst, currentAndroid, plebstrAndroid, freeFromAndroid, voyage, + nos, damus, nostur, primalIOS, freeFromIOS, yakihonneIOS, + voyage, yakihonneAndroid, yanaAndroid, freeFromAndroid, amethyst, } case 30023, 30024: clients = []ClientReference{ native, yakihonne, habla, highlighter, notestack, - damus, nos, nostur, - amethyst, springAndroid, + damus, nos, nostur, yakihonneIOS, + yakihonneAndroid, amethyst, } case 1063: clients = []ClientReference{ native, - snort, coracle, + snort, coracle, nostrudel, amethyst, } case 30311: @@ -110,15 +105,15 @@ func generateClientList( case 31922, 31923: clients = []ClientReference{ native, - coracle, flockstr, + coracle, amethyst, } default: clients = []ClientReference{ native, - coracle, snort, nostter, nostrudel, primalWeb, satellite, iris, - nos, damus, nostur, primalIOS, freeFromIOS, plebstrIOS, - yanaAndroid, springAndroid, amethyst, currentAndroid, plebstrAndroid, freeFromAndroid, voyage, + yakihonne, coracle, snort, nostter, nostrudel, primalWeb, + yakihonneIOS, nos, damus, nostur, primalIOS, freeFromIOS, + yakihonneAndroid, yanaAndroid, amethyst, freeFromAndroid, voyage, } } diff --git a/homepage.templ b/homepage.templ index 6ff4495..4e38ab7 100644 --- a/homepage.templ +++ b/homepage.templ @@ -191,8 +191,8 @@ new Typewriter(tw, {

Coracle

 - -

Nostter

+ +

Voyage
@@ -209,26 +209,26 @@ new Typewriter(tw, {

Long-form

- -

Yakihonne

+ +

Highlighter

Comet

 - -

Shipyard

+ +

Habla

Community

- -

Highlighter

+ +

Chachi

 - +

Flotilla

 - -

Creatr

+ +

0xchat
@@ -236,11 +236,11 @@ new Typewriter(tw, {

Nostur

 - -

Amethyst

+ +

Yakihonne

 - -

0xchat

+ +

Zapstore
diff --git a/justfile b/justfile index 6d38257..4ff1235 100644 --- a/justfile +++ b/justfile @@ -9,9 +9,9 @@ build: templ tailwind deploy target: templ tailwind CGO_CFLAGS="-I$(pwd)/secp256k1-master/musl/include/" CGO_LDFLAGS="-L$(pwd)/secp256k1-master/musl/lib" GOOS=linux GOARCH=amd64 CC=$(which musl-gcc) go build -tags libsecp256k1 -ldflags="-s -w -linkmode external -extldflags '-static' -X main.compileTimeTs=$(date '+%s')" -o ./njump scp njump {{target}}:njump/njump-new - ssh njump 'systemctl stop njump' - ssh njump 'mv njump/njump-new njump/njump' - ssh njump 'systemctl start njump' + ssh {{target}} 'systemctl stop njump' + ssh {{target}} 'mv njump/njump-new njump/njump' + ssh {{target}} 'systemctl start njump' libsecp256k1: wget https://github.com/bitcoin-core/secp256k1/archive/refs/heads/master.zip