Fixes relay type loading from the default list when they are not present in the user's account yet.

This commit is contained in:
Vitor Pamplona
2023-09-29 16:23:42 -04:00
parent 47d57e5a44
commit 386b6db5ff
@@ -2955,7 +2955,10 @@ class Account(
// Takes a User's relay list and adds the types of feeds they are active for. // Takes a User's relay list and adds the types of feeds they are active for.
fun activeRelays(): Array<Relay>? { fun activeRelays(): Array<Relay>? {
var usersRelayList = userProfile().latestContactList?.relays()?.map { var usersRelayList = userProfile().latestContactList?.relays()?.map {
val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes ?: FeedType.values().toSet() val localFeedTypes = localRelays.firstOrNull() { localRelay -> localRelay.url == it.key }?.feedTypes
?: Constants.defaultRelays.filter { defaultRelay -> defaultRelay.url == it.key }.firstOrNull()?.feedTypes
?: FeedType.values().toSet()
Relay(it.key, it.value.read, it.value.write, localFeedTypes, proxy) Relay(it.key, it.value.read, it.value.write, localFeedTypes, proxy)
} ?: return null } ?: return null