From 82534cad50960bcfcc08927580cf6449036880ed Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sun, 24 Aug 2025 11:58:28 +0200 Subject: [PATCH] turn off default relays --- .../java/com/bitchat/android/nostr/NostrGeohashService.kt | 8 ++++---- .../java/com/bitchat/android/nostr/NostrRelayManager.kt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/bitchat/android/nostr/NostrGeohashService.kt b/app/src/main/java/com/bitchat/android/nostr/NostrGeohashService.kt index 9f244618..636576aa 100644 --- a/app/src/main/java/com/bitchat/android/nostr/NostrGeohashService.kt +++ b/app/src/main/java/com/bitchat/android/nostr/NostrGeohashService.kt @@ -188,7 +188,7 @@ class NostrGeohashService( nostrRelayManager.sendEventToGeohash( event = event, geohash = channel.geohash, - includeDefaults = true, + includeDefaults = false, nRelays = 5 ) @@ -551,7 +551,7 @@ class NostrGeohashService( handler = { event -> handleUnifiedGeohashEvent(event, geohash) }, - includeDefaults = true, + includeDefaults = false, nRelays = 5 ) @@ -882,7 +882,7 @@ class NostrGeohashService( handler = { event -> handleUnifiedGeohashEvent(event, channel.channel.geohash) }, - includeDefaults = true, + includeDefaults = false, nRelays = 5 ) @@ -909,7 +909,7 @@ class NostrGeohashService( handler = { giftWrap -> handleGeohashDmEvent(giftWrap, channel.channel.geohash, dmIdentity) }, - includeDefaults = true, + includeDefaults = false, nRelays = 5 ) diff --git a/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt b/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt index 231d4643..9572b010 100644 --- a/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt +++ b/app/src/main/java/com/bitchat/android/nostr/NostrRelayManager.kt @@ -130,7 +130,7 @@ class NostrRelayManager private constructor() { /** * Compute and connect to relays for a given geohash (nearest + optional defaults), cache the mapping. */ - fun ensureGeohashRelaysConnected(geohash: String, nRelays: Int = 5, includeDefaults: Boolean = true) { + fun ensureGeohashRelaysConnected(geohash: String, nRelays: Int = 5, includeDefaults: Boolean = false) { try { val nearest = RelayDirectory.closestRelaysForGeohash(geohash, nRelays) val selected = if (includeDefaults) { @@ -163,7 +163,7 @@ class NostrRelayManager private constructor() { filter: NostrFilter, id: String = generateSubscriptionId(), handler: (NostrEvent) -> Unit, - includeDefaults: Boolean = true, + includeDefaults: Boolean = false, nRelays: Int = 5 ): String { ensureGeohashRelaysConnected(geohash, nRelays, includeDefaults) @@ -185,7 +185,7 @@ class NostrRelayManager private constructor() { /** * Send an event specifically to a geohash's relays (+ optional defaults). */ - fun sendEventToGeohash(event: NostrEvent, geohash: String, includeDefaults: Boolean = true, nRelays: Int = 5) { + fun sendEventToGeohash(event: NostrEvent, geohash: String, includeDefaults: Boolean = false, nRelays: Int = 5) { ensureGeohashRelaysConnected(geohash, nRelays, includeDefaults) val relayUrls = getRelaysForGeohash(geohash) if (relayUrls.isEmpty()) {