Kieran
/
snort
5
14
Fork 14
Code Issues 53 Pull Requests 1 Packages Projects Releases 24 Wiki Activity

Revert "fix stale relays bug" 

This reverts commit 32c2e663a9.
This commit is contained in:
Sam Samskies 2023-02-20 15:42:48 -06:00
parent 32c2e663a9
commit eddba62575
No known key found for this signature in database
GPG Key ID: E3F697EE1B6EB156
2 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/app/src/Feed/EventPublisher.ts
View File

@ -116,15 +116,6 @@ export default function useEventPublisher() {
}
}
},
/**
* Write to every online relay using Blastr.
* https://github.com/MutinyWallet/blastr
*/
broadcastWithBlastr: (ev: NEvent | undefined) => {
if (ev) {
System.WriteOnceToRelay("wss://nostr.mutinywallet.com", ev);
}
},
muted: async (keys: HexKey[], priv: HexKey[]) => {
if (pubKey) {
const ev = NEvent.ForPubKey(pubKey);
@ -260,6 +251,18 @@ export default function useEventPublisher() {
return await signEvent(ev);
}
},
saveRelays: async () => {
if (pubKey) {
const ev = NEvent.ForPubKey(pubKey);
ev.Kind = EventKind.ContactList;
ev.Content = JSON.stringify(relays);
for (const pk of follows) {
ev.Tags.push(new Tag(["p", pk], ev.Tags.length));
}
return await signEvent(ev);
}
},
saveRelaysSettings: async () => {
if (pubKey) {
const ev = NEvent.ForPubKey(pubKey);

30
packages/app/src/Pages/settings/Relays.tsx
View File

@ -18,33 +18,17 @@ const RelaySettingsPage = () => {
const [newRelay, setNewRelay] = useState<string>();
async function saveRelays() {
const updatedRelaysEvent = await publisher.saveRelaysSettings();
let wasBlastrBrodcastSuccessful: boolean;
const ev = await publisher.saveRelays();
publisher.broadcast(ev);
publisher.broadcastForBootstrap(ev);
try {
publisher.broadcast(updatedRelaysEvent);
publisher.broadcastForBootstrap(updatedRelaysEvent);
const onlineRelays = await fetch("https://api.nostr.watch/v1/online").then(r => r.json());
const settingsEv = await publisher.saveRelaysSettings();
const rs = Object.keys(relays).concat(randomSample(onlineRelays, 20));
publisher.broadcastAll(settingsEv, rs);
} catch (error) {
console.error(error);
}
try {
publisher.broadcastWithBlastr(updatedRelaysEvent);
wasBlastrBrodcastSuccessful = true;
} catch (error) {
console.error(error);
wasBlastrBrodcastSuccessful = false;
}
if (!wasBlastrBrodcastSuccessful) {
try {
const onlineRelays = await fetch("https://api.nostr.watch/v1/online").then(r => r.json());
const rs = Object.keys(relays).concat(randomSample(onlineRelays, 20));
publisher.broadcastAll(updatedRelaysEvent, rs);
} catch (error) {
console.error(error);
}
}
}
function addRelay() {