nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

change mute test to equality with string including event 30000 and user hex

Browse Source
This commit is contained in:
David Kaspar
2023-10-09 13:53:09 +02:00
parent 071df0b6d3
commit c7861dfac4
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
+1 -3
View File
@@ -13,14 +13,12 @@ import com.vitorpamplona.quartz.utils.TimeUtils
class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() { class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE)
override fun feedKey(): String { override fun feedKey(): String {
return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList
} }
override fun showHiddenKey(): Boolean { override fun showHiddenKey(): Boolean {
return regex.matches(account.defaultHomeFollowList) return account.defaultHomeFollowList == "30000:${account.userProfile().pubkeyHex}:${PeopleListEvent.blockList}"
} }
override fun feed(): List<Note> { override fun feed(): List<Note> {
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
+1 -3
View File
@@ -18,14 +18,12 @@ import com.vitorpamplona.quartz.utils.TimeUtils
class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() { class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
private val regex = ("30000:[a-f0-9]+:" + PeopleListEvent.blockList).toRegex(RegexOption.IGNORE_CASE)
override fun feedKey(): String { override fun feedKey(): String {
return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList
} }
override fun showHiddenKey(): Boolean { override fun showHiddenKey(): Boolean {
return regex.matches(account.defaultHomeFollowList) return account.defaultHomeFollowList == "30000:${account.userProfile().pubkeyHex}:${PeopleListEvent.blockList}"
} }
override fun feed(): List<Note> { override fun feed(): List<Note> {