From d1da863d3cb4957664b16e12d28558cb6c5386c0 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 19 Jul 2024 16:14:14 -0400 Subject: [PATCH 01/16] Making sure an empty relay list uses the default list from Amethyst --- .../vitorpamplona/amethyst/model/Account.kt | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 07a0f0d6d0..0546d0806b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -2761,19 +2761,22 @@ class Account( // Takes a User's relay list and adds the types of feeds they are active for. fun activeRelays(): Array? { val usersRelayList = - userProfile().latestContactList?.relays()?.map { - val url = RelayUrlFormatter.normalize(it.key) + userProfile() + .latestContactList + ?.relays() + ?.map { + val url = RelayUrlFormatter.normalize(it.key) - val localFeedTypes = - localRelays.firstOrNull { localRelay -> RelayUrlFormatter.normalize(localRelay.url) == url }?.feedTypes?.minus(setOf(FeedType.SEARCH, FeedType.WALLET_CONNECT)) - ?: Constants.defaultRelays - .filter { defaultRelay -> defaultRelay.url == url } - .firstOrNull() - ?.feedTypes - ?: Constants.activeTypesGlobalChats + val localFeedTypes = + localRelays.firstOrNull { localRelay -> RelayUrlFormatter.normalize(localRelay.url) == url }?.feedTypes?.minus(setOf(FeedType.SEARCH, FeedType.WALLET_CONNECT)) + ?: Constants.defaultRelays + .filter { defaultRelay -> defaultRelay.url == url } + .firstOrNull() + ?.feedTypes + ?: Constants.activeTypesGlobalChats - RelaySetupInfo(url, it.value.read, it.value.write, localFeedTypes) - } ?: return null + RelaySetupInfo(url, it.value.read, it.value.write, localFeedTypes) + }?.ifEmpty { null } ?: return null return usersRelayList.toTypedArray() } From 2b6a48f391c981b87114942138f9ba77da2f2a9f Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 19 Jul 2024 16:40:46 -0400 Subject: [PATCH 02/16] Fixes issue with super large follow lists. --- .../com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt index df1a06ca1c..b224252c9b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt @@ -112,7 +112,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") { fun createFollowMetadataAndReleaseFilter(): TypedFilter? { val follows = account.liveHomeFollowLists.value?.users - val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null } + val followSet = follows?.plus(account.userProfile().pubkeyHex)?.shuffled()?.ifEmpty { null } return if (followSet != null) { TypedFilter( @@ -124,7 +124,7 @@ object NostrHomeDataSource : AmethystNostrDataSource("HomeFeed") { MetadataEvent.KIND, AdvertisedRelayListEvent.KIND, ), - authors = followSet, + authors = followSet.take(500), since = latestEOSEs.users[account.userProfile()] ?.followList From b6cb839fe78b97a2ce0f2925ed39ddbba8c49398 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 19 Jul 2024 16:44:30 -0400 Subject: [PATCH 03/16] v0.89.3 --- amethyst/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amethyst/build.gradle b/amethyst/build.gradle index 0f21d2d8d9..6f594372ac 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.vitorpamplona.amethyst" minSdk libs.versions.android.minSdk.get().toInteger() targetSdk libs.versions.android.targetSdk.get().toInteger() - versionCode 388 - versionName "0.89.2" + versionCode 389 + versionName "0.89.3" buildConfigField "String", "RELEASE_NOTES_ID", "\"1130badb252bdf62aaf93cb65bfa2bb09e7600c7d6764894f2954555b3b73018\"" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From f9ddf766860972a666e341da89b8a90d471512c6 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 19 Jul 2024 17:09:56 -0400 Subject: [PATCH 04/16] action bar fix --- amethyst/src/main/res/values-night/themes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amethyst/src/main/res/values-night/themes.xml b/amethyst/src/main/res/values-night/themes.xml index cd2b306aba..909b3e0a03 100644 --- a/amethyst/src/main/res/values-night/themes.xml +++ b/amethyst/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ -