Only adds search relays if none of the current relays are active for search.
This commit is contained in:
@@ -57,18 +57,25 @@ class NewRelayListViewModel : ViewModel() {
|
|||||||
_relays.update {
|
_relays.update {
|
||||||
var relayFile = account.userProfile().latestContactList?.relays()
|
var relayFile = account.userProfile().latestContactList?.relays()
|
||||||
|
|
||||||
// Ugly, but forces nostr.band as the only search-supporting relay today.
|
|
||||||
// TODO: Remove when search becomes more available.
|
|
||||||
if (relayFile?.none { it.key.removeSuffix("/") in Constants.forcedRelaysForSearchSet } == true) {
|
|
||||||
relayFile = relayFile + Constants.forcedRelayForSearch.map {
|
|
||||||
Pair(
|
|
||||||
it.url,
|
|
||||||
ContactListEvent.ReadWrite(it.read, it.write)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (relayFile != null) {
|
if (relayFile != null) {
|
||||||
|
// Ugly, but forces nostr.band as the only search-supporting relay today.
|
||||||
|
// TODO: Remove when search becomes more available.
|
||||||
|
|
||||||
|
val needsSearchRelay = relayFile.none {
|
||||||
|
it.key.removeSuffix("/") in Constants.forcedRelaysForSearchSet
|
||||||
|
} && relayFile.none {
|
||||||
|
account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes?.contains(FeedType.SEARCH) ?: false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (needsSearchRelay) {
|
||||||
|
relayFile = relayFile + Constants.forcedRelayForSearch.map {
|
||||||
|
Pair(
|
||||||
|
it.url,
|
||||||
|
ContactListEvent.ReadWrite(it.read, it.write)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
relayFile.map {
|
relayFile.map {
|
||||||
val liveRelay = RelayPool.getRelay(it.key)
|
val liveRelay = RelayPool.getRelay(it.key)
|
||||||
val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes
|
val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes
|
||||||
|
|||||||
Reference in New Issue
Block a user