highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-08-08 17:22:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes relay list assembling

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-29 15:58:47 -04:00
parent 56664afa4e
commit 550cfe8bb4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -236,8 +236,8 @@ class Account(
) { nip65RelayList, dmRelayList, searchRelayList, userProfile -> ) { nip65RelayList, dmRelayList, searchRelayList, userProfile ->
val baseRelaySet = activeRelays() ?: convertLocalRelays() val baseRelaySet = activeRelays() ?: convertLocalRelays()
val newDMRelaySet = (dmRelayList.note.event as? ChatMessageRelayListEvent)?.relays()?.toSet() ?: emptySet() val newDMRelaySet = (dmRelayList.note.event as? ChatMessageRelayListEvent)?.relays()?.toSet() ?: emptySet()
val searchRelaySet = (dmRelayList.note.event as? SearchRelayListEvent)?.relays()?.toSet() ?: Constants.defaultSearchRelaySet val searchRelaySet = (searchRelayList.note.event as? SearchRelayListEvent)?.relays()?.toSet() ?: Constants.defaultSearchRelaySet
val nip65RelaySet = (dmRelayList.note.event as? AdvertisedRelayListEvent)?.relays() val nip65RelaySet = (nip65RelayList.note.event as? AdvertisedRelayListEvent)?.relays()
var mappedRelaySet = var mappedRelaySet =
baseRelaySet.map { baseRelaySet.map {
@@ -276,7 +276,7 @@ class Account(
val read = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ val read = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
val write = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ val write = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
Relay(relay.url, read, write, relay.activeTypes) Relay(relay.url, read, write, relay.activeTypes + setOf(FeedType.FOLLOWS, FeedType.GLOBAL, FeedType.PUBLIC_CHATS))
} else { } else {
relay relay
} }

2
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt
View File

@@ -44,7 +44,7 @@ object Client : RelayPool.Listener {
relays: Array<Relay>?, relays: Array<Relay>?,
onlyIfChanged: Boolean = false, onlyIfChanged: Boolean = false,
) { ) {
Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays") Log.d("Relay", "Relay Pool Reconnecting to ${relays?.size} relays: \n${relays?.joinToString("\n") { it.url + " " + it.read + " " + it.write + " " + it.activeTypes.joinToString(",") { it.name } }}")
checkNotInMainThread() checkNotInMainThread()
if (onlyIfChanged) { if (onlyIfChanged) {