From d41e7e5ce05726057c7ae431db761ae1f95d2a96 Mon Sep 17 00:00:00 2001
From: Martti Malmi <sirius@iki.fi>
Date: Tue, 28 Nov 2023 10:47:27 +0200
Subject: [PATCH] use CONFIG.defaultRelays for new users

---
 packages/app/config/iris.json                       |  4 +++-
 .../Event/NoteBroadcaster/NoteBroadcaster.tsx       |  2 +-
 .../app/src/Element/Event/NoteBroadcaster/util.ts   | 13 +++++++++----
 packages/app/src/Element/Event/NoteCreator.tsx      |  6 ++++--
 packages/app/src/Login/Functions.ts                 |  5 +++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/app/config/iris.json b/packages/app/config/iris.json
index 2f8aa3ad..246754bb 100644
--- a/packages/app/config/iris.json
+++ b/packages/app/config/iris.json
@@ -23,6 +23,8 @@
   "defaultRelays": {
     "wss://relay.snort.social/": { "read": true, "write": true },
     "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 }
   }
 }
diff --git a/packages/app/src/Element/Event/NoteBroadcaster/NoteBroadcaster.tsx b/packages/app/src/Element/Event/NoteBroadcaster/NoteBroadcaster.tsx
index fd10e106..c06584e4 100644
--- a/packages/app/src/Element/Event/NoteBroadcaster/NoteBroadcaster.tsx
+++ b/packages/app/src/Element/Event/NoteBroadcaster/NoteBroadcaster.tsx
@@ -10,7 +10,7 @@ import { removeRelay } from "@/Login";
 import useLogin from "@/Hooks/useLogin";
 import useEventPublisher from "@/Hooks/useEventPublisher";
 import { saveRelays } from "@/Pages/settings/Relays";
-import {sendEventToRelays} from "@/Element/Event/NoteBroadcaster/util";
+import { sendEventToRelays } from "@/Element/Event/NoteBroadcaster/util";
 
 export function NoteBroadcaster({
   evs,
diff --git a/packages/app/src/Element/Event/NoteBroadcaster/util.ts b/packages/app/src/Element/Event/NoteBroadcaster/util.ts
index 09d98ac8..684ce961 100644
--- a/packages/app/src/Element/Event/NoteBroadcaster/util.ts
+++ b/packages/app/src/Element/Event/NoteBroadcaster/util.ts
@@ -1,7 +1,12 @@
-import {NostrEvent, OkResponse, SystemInterface} from "@snort/system";
-import {removeUndefined} from "@snort/shared";
+import { NostrEvent, OkResponse, SystemInterface } from "@snort/system";
+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);
   if (customRelays) {
     return removeUndefined(
@@ -20,4 +25,4 @@ export async function sendEventToRelays(system: SystemInterface, ev: NostrEvent,
     setResults?.(responses);
     return responses;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/app/src/Element/Event/NoteCreator.tsx b/packages/app/src/Element/Event/NoteCreator.tsx
index b2860aed..a8baeebb 100644
--- a/packages/app/src/Element/Event/NoteCreator.tsx
+++ b/packages/app/src/Element/Event/NoteCreator.tsx
@@ -26,7 +26,7 @@ import FileUploadProgress from "./FileUpload";
 import { ToggleSwitch } from "@/Icons/Toggle";
 import NostrBandApi from "@/External/NostrBand";
 import { useLocale } from "@/IntlProvider";
-import {sendEventToRelays} from "@/Element/Event/NoteBroadcaster/util";
+import { sendEventToRelays } from "@/Element/Event/NoteBroadcaster/util";
 
 export function NoteCreator() {
   const { formatMessage } = useIntl();
@@ -156,7 +156,9 @@ export function NoteCreator() {
         n.sending = events;
       });
       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();
       }
     }
diff --git a/packages/app/src/Login/Functions.ts b/packages/app/src/Login/Functions.ts
index c99a9a36..b0cfc9c9 100644
--- a/packages/app/src/Login/Functions.ts
+++ b/packages/app/src/Login/Functions.ts
@@ -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
   await Promise.all(Object.entries(newRelays).map(([k, v]) => system.ConnectToRelay(k, v)));