From ac0fbc7435763d5be782b2086ec74dc7e7943469 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Mon, 9 Oct 2023 13:01:32 +0200 Subject: [PATCH 1/3] change equality test of Mute list from equals "mute" to ends with mute" --- .../amethyst/ui/dal/HomeConversationsFeedFilter.kt | 2 +- .../vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt index b9f400176..f959cc28c 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt @@ -18,7 +18,7 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt index d5eab0853..e7cb4d911 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt @@ -22,7 +22,7 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter() } override fun showHiddenKey(): Boolean { - return account.defaultHomeFollowList == PeopleListEvent.blockList + return account.defaultHomeFollowList.endsWith(PeopleListEvent.blockList) } override fun feed(): List { From 071df0b6d367391f4ad04b2f4d712c16d5963732 Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Mon, 9 Oct 2023 13:13:10 +0200 Subject: [PATCH 2/3] change equality test of Mute list to regular expression --- .../amethyst/ui/dal/HomeConversationsFeedFilter.kt | 4 +++- .../vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt index f959cc28c..756733bf5 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt @@ -13,12 +13,14 @@ import com.vitorpamplona.quartz.utils.TimeUtils class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter() { + private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE) + override fun feedKey(): String { return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList } override fun showHiddenKey(): Boolean { - return account.defaultHomeFollowList.endsWith(PeopleListEvent.blockList) + return regex.matches(account.defaultHomeFollowList) } override fun feed(): List { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt index e7cb4d911..2dab0008b 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt @@ -17,12 +17,15 @@ import com.vitorpamplona.quartz.events.TextNoteEvent import com.vitorpamplona.quartz.utils.TimeUtils class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter() { + + private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE) + override fun feedKey(): String { return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList } override fun showHiddenKey(): Boolean { - return account.defaultHomeFollowList.endsWith(PeopleListEvent.blockList) + return regex.matches(account.defaultHomeFollowList) } override fun feed(): List { From c7861dfac44a58a8b5d574f1c4eb42d10649df4c Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Mon, 9 Oct 2023 13:53:09 +0200 Subject: [PATCH 3/3] change mute test to equality with string including event 30000 and user hex --- .../amethyst/ui/dal/HomeConversationsFeedFilter.kt | 4 +--- .../vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt index 756733bf5..5a5a94185 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt @@ -13,14 +13,12 @@ import com.vitorpamplona.quartz.utils.TimeUtils class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter() { - private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE) - override fun feedKey(): String { return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList } override fun showHiddenKey(): Boolean { - return regex.matches(account.defaultHomeFollowList) + return account.defaultHomeFollowList == "30000:${account.userProfile().pubkeyHex}:${PeopleListEvent.blockList}" } override fun feed(): List { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt index 2dab0008b..44e6dbbdd 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt @@ -18,14 +18,12 @@ import com.vitorpamplona.quartz.utils.TimeUtils class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter() { - private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE) - override fun feedKey(): String { return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList } override fun showHiddenKey(): Boolean { - return regex.matches(account.defaultHomeFollowList) + return account.defaultHomeFollowList == "30000:${account.userProfile().pubkeyHex}:${PeopleListEvent.blockList}" } override fun feed(): List {