diff --git a/content/meta.json b/content/meta.json index 619122757b1..fe087c720b2 100644 --- a/content/meta.json +++ b/content/meta.json @@ -19,9 +19,12 @@ "anchorUrl": "https://anchor.fm/einundzwanzig", "masterFeedUrl": "https://anchor.fm/s/d8d3c38/podcast/rss", "publicFeedUrl": "https://einundzwanzig.space/feed.xml", - "nostr": "npub1qv02xpsc3lhxxx5x7xswf88w3u7kykft9ea7t78tz7ywxf7mxs9qrxujnc", - "nostrTalk": "npub1talku5l4z88dys5eg8zvz8em2qxv8nfxxanjszzdsrmke0ssaekqqxvkq9", "nodeId": "03a09f56bba3d2c200cc55eda2f1f069564a97c1fb74345e1560e2868a8ab3d7d0", + "npub": { + "einundzwanzig": "npub1qv02xpsc3lhxxx5x7xswf88w3u7kykft9ea7t78tz7ywxf7mxs9qrxujnc", + "nostrTalk": "npub1talku5l4z88dys5eg8zvz8em2qxv8nfxxanjszzdsrmke0ssaekqqxvkq9", + "zitadelle": "npub12gu2kjnlnkrkjt2npteh3qcn8cp8q5ufamw6jzkk4sjk7snd8flqa3sz97" + }, "ticker": [ "Sende uns einen Shoutout: 10.000 Sats und du bist dabei", "\"Hosp oder top!\" ist Spiel des Jahres 2021", diff --git a/src/includes/_footer.pug b/src/includes/_footer.pug index 46ce6a2aa4b..7d8f6ab092e 100644 --- a/src/includes/_footer.pug +++ b/src/includes/_footer.pug @@ -14,7 +14,7 @@ footer#footer.footer +sprite("youtube") a(href=site.meta.instagramUrl rel="me nofollow noopener" target="_blank" title="Instagram") +sprite("instagram") - a(href=`https://snort.social/p/${site.meta.nostr}` rel="me nofollow noopener" target="_blank" title="Nostr") + a(href=`https://primal.net/p/${site.meta.npub.einundzwanzig}` rel="me nofollow noopener" target="_blank" title="Nostr") +sprite("nostr") a(href=site.meta.soundcloudUrl rel="me nofollow noopener" target="_blank" title="Soundcloud") +sprite("soundcloud") diff --git a/src/member.pug b/src/member.pug index ac4b949c8b2..28fc1faf643 100644 --- a/src/member.pug +++ b/src/member.pug @@ -15,7 +15,7 @@ block main !=markdown(member.text) .links if member.nostr - a(href=`https://snort.social/p/${member.nostr}` target="_blank" rel="nofollow noopener" title=`${member.name} on Nostr`) + a(href=`https://primal.net/p/${member.nostr}` target="_blank" rel="nofollow noopener" title=`${member.name} on Nostr`) +sprite("nostr") if member.twitter a(href=`https://twitter.com/${member.twitter}` target="_blank" rel="nofollow noopener" title=`${member.name} on Twitter`) diff --git a/static/js/main.js b/static/js/main.js index 2113da613ec..c0c84f2939a 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -79,7 +79,7 @@ const onMeetupMapMarkerClick = (m, modalId) => { Links zum Treffen: ${link(m.event.portalLink, 'Portal')} ${link(m.event.link, 'Website')} - ${link(m.event.nostr_note ? `https://snort.social/e/${m.event.nostr_note}` : null, 'Nostr')} + ${link(m.event.nostr_note ? `https://primal.net/e/${m.event.nostr_note}` : null, 'Nostr')}

` : '') toggleModal(modalId) diff --git a/tasks/fetch_feed.js b/tasks/fetch_feed.js index 15f6ffaadc8..3fa546044f7 100644 --- a/tasks/fetch_feed.js +++ b/tasks/fetch_feed.js @@ -207,7 +207,7 @@ const parseEpisode = e => { people.forEach(p => { let href = p.url - if (!href && p.nostr) href = `https://snort.social/p/${p.nostr}` + if (!href && p.nostr) href = `https://primal.net/p/${p.nostr}` if (!href && p.twitter) href = `https://twitter.com/${p.twitter}` updated['podcast:person'].push({ __attr: { href }, diff --git a/tasks/generate_nostr.js b/tasks/generate_nostr.js index 08a99e6cf7a..75cb5737fac 100644 --- a/tasks/generate_nostr.js +++ b/tasks/generate_nostr.js @@ -2,17 +2,19 @@ const { mkdirSync, writeFileSync } = require('fs') const { dirname, resolve } = require('path') const { NDKUser } = require('@nostr-dev-kit/ndk') const team = require('../content/team.json') -const { nostr: einundzwanzigNpub, nostrTalk: nostrTalkNpub } = require('../content/meta.json') +const { npub } = require('../content/meta.json') -const einundzwanzigHex = new NDKUser({ npub: einundzwanzigNpub }).hexpubkey -const nostrTalkHex = new NDKUser({ npub: nostrTalkNpub }).hexpubkey +const einundzwanzig = new NDKUser({ npub: npub.einundzwanzig }) +const nostrtalk = new NDKUser({ npub: npub.nostrTalk }) +const zitadelle = new NDKUser({ npub: npub.zitadelle }) const names = { - "_": einundzwanzigHex, - "einundzwanzig": einundzwanzigHex, - "nostrtalk": nostrTalkHex + "_": einundzwanzig.pubkey, + "einundzwanzig": einundzwanzig.pubkey, + "nostrtalk": nostrtalk.pubkey, + "zitadelle": zitadelle.pubkey } const relays = { - [einundzwanzigHex]: [ + [npub.einundzwanzig]: [ "wss://nostr.einundzwanzig.space" ] } @@ -20,7 +22,7 @@ const relays = { Object.entries(team).forEach(([key, { nostr: npub }]) => { if (!npub) return const id = key.replace(/[\s]/g, '_') - names[id] = new NDKUser({ npub }).hexpubkey + names[id] = new NDKUser({ npub }).pubkey }) const dst = resolve(__dirname, '..', 'dist', '.well-known', 'nostr.json')