0xshushu/dfklfg
1
0
Fork 0
forked from Kieran/snort
Code Pull Requests Activity

use CONFIG.defaultRelays for new users

Browse Source
This commit is contained in:
Martti Malmi 2023-11-28 10:47:27 +02:00
parent 9d0f7f4596
commit d41e7e5ce0
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app/config/iris.json
View File

@ -23,6 +23,8 @@
"defaultRelays": { "defaultRelays": {
"wss://relay.snort.social/": { "read": true, "write": true }, "wss://relay.snort.social/": { "read": true, "write": true },
"wss://nostr.wine/": { "read": true, "write": false }, "wss://nostr.wine/": { "read": true, "write": false },
"wss://eden.nostr.land/": { "read": true, "write": false } "wss://eden.nostr.land/": { "read": true, "write": false },
"wss://relay.nostr.band/": { "read": true, "write": true },
"wss://relay.damus.io/": { "read": true, "write": true }
} }
} }

2
packages/app/src/Element/Event/NoteBroadcaster/NoteBroadcaster.tsx
View File

@ -10,7 +10,7 @@ import { removeRelay } from "@/Login";
import useLogin from "@/Hooks/useLogin"; import useLogin from "@/Hooks/useLogin";
import useEventPublisher from "@/Hooks/useEventPublisher"; import useEventPublisher from "@/Hooks/useEventPublisher";
import { saveRelays } from "@/Pages/settings/Relays"; import { saveRelays } from "@/Pages/settings/Relays";
import {sendEventToRelays} from "@/Element/Event/NoteBroadcaster/util"; import { sendEventToRelays } from "@/Element/Event/NoteBroadcaster/util";
export function NoteBroadcaster({ export function NoteBroadcaster({
evs, evs,

11
packages/app/src/Element/Event/NoteBroadcaster/util.ts
View File

@ -1,7 +1,12 @@
import {NostrEvent, OkResponse, SystemInterface} from "@snort/system"; import { NostrEvent, OkResponse, SystemInterface } from "@snort/system";
import {removeUndefined} from "@snort/shared"; import { removeUndefined } from "@snort/shared";
export async function sendEventToRelays(system: SystemInterface, ev: NostrEvent, customRelays?: Array<string>, setResults?: (x: Array<OkResponse>) => void) { export async function sendEventToRelays(
system: SystemInterface,
ev: NostrEvent,
customRelays?: Array<string>,
setResults?: (x: Array<OkResponse>) => void,
) {
console.log("sendEventToRelays", ev, customRelays); console.log("sendEventToRelays", ev, customRelays);
if (customRelays) { if (customRelays) {
return removeUndefined( return removeUndefined(

6
packages/app/src/Element/Event/NoteCreator.tsx
View File

@ -26,7 +26,7 @@ import FileUploadProgress from "./FileUpload";
import { ToggleSwitch } from "@/Icons/Toggle"; import { ToggleSwitch } from "@/Icons/Toggle";
import NostrBandApi from "@/External/NostrBand"; import NostrBandApi from "@/External/NostrBand";
import { useLocale } from "@/IntlProvider"; import { useLocale } from "@/IntlProvider";
import {sendEventToRelays} from "@/Element/Event/NoteBroadcaster/util"; import { sendEventToRelays } from "@/Element/Event/NoteBroadcaster/util";
export function NoteCreator() { export function NoteCreator() {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
@ -156,7 +156,9 @@ export function NoteCreator() {
n.sending = events; n.sending = events;
}); });
if (!CONFIG.showNoteBroadcaster) { if (!CONFIG.showNoteBroadcaster) {
Promise.all(events.map(a => sendEventToRelays(system, a, note.selectedCustomRelays)).flat()).catch(console.error); Promise.all(events.map(a => sendEventToRelays(system, a, note.selectedCustomRelays)).flat()).catch(
console.error,
);
reset(); reset();
} }
} }

5
packages/app/src/Login/Functions.ts
View File

@ -109,6 +109,11 @@ export async function generateNewLogin(
} }
} }
} }
for (const [k, v] of Object.entries(CONFIG.defaultRelays)) {
if (!newRelays[k]) {
newRelays[k] = v;
}
}
// connect to new relays // connect to new relays
await Promise.all(Object.entries(newRelays).map(([k, v]) => system.ConnectToRelay(k, v))); await Promise.all(Object.entries(newRelays).map(([k, v]) => system.ConnectToRelay(k, v)));