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

Fixes missing relays certain internal lists

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-31 19:47:40 -04:00
parent 1bbcb97d54
commit d307bb0e49
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ class Account(
mappedRelaySet =
mappedRelaySet.map {
if (searchRelaySet.contains(it.url)) {
Relay(it.url, true, false, it.activeTypes + FeedType.SEARCH)
Relay(it.url, true, it.write || false, it.activeTypes + FeedType.SEARCH)
} else {
it
}
@@ -2606,18 +2606,14 @@ class Account(
}
fun activeGlobalRelays(): Array<String> {
return (activeRelays() ?: convertLocalRelays())
return connectToRelays.value
.filter { it.activeTypes.contains(FeedType.GLOBAL) }
.map { it.url }
.toTypedArray()
}
fun activeWriteRelays(): List<Relay> {
return (activeRelays() ?: convertLocalRelays()).filter { it.write }
}
fun activeAllRelays(): List<Relay> {
return ((activeRelays() ?: convertLocalRelays()).toList())
return connectToRelays.value.filter { it.write }
}
fun isAllHidden(users: Set<HexKey>): Boolean {

5
app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
View File

@@ -181,8 +181,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
?.followList
?.get(account.defaultNotificationFollowList.value)
?.relayList
?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
return TypedFilter(
types = COMMON_FEED_TYPES,
@@ -214,7 +213,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
?.followList
?.get(account.defaultNotificationFollowList.value)
?.relayList
?: account.activeRelays()?.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
?: account.connectToRelays.value.associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
?: account.convertLocalRelays().associate { it.url to EOSETime(TimeUtils.oneWeekAgo()) }
return TypedFilter(

2
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/RelaySelectionDialog.kt
View File

@@ -79,7 +79,7 @@ fun RelaySelectionDialog(
var relays by remember {
mutableStateOf(
accountViewModel.account.activeAllRelays().map {
accountViewModel.account.connectToRelays.value.map {
RelayList(
relay = it,
relayInfo = RelayBriefInfoCache.RelayBriefInfo(it.url),

2
app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayCompose.kt
View File

@@ -114,7 +114,7 @@ private fun RelayOptions(
val isNotUsingRelay =
remember(userState) {
accountViewModel.account.activeRelays()?.none { it.url == relay.url } == true
accountViewModel.account.connectToRelays.value.none { it.url == relay.url }
}
if (isNotUsingRelay) {