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

Making tags case insensitive

Browse Source
This commit is contained in:
Vitor Pamplona
2023-03-17 10:22:58 -04:00
parent 97ec28d2c8
commit 81e31319c7
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,7 +330,7 @@ class Account(
if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) { if (contactList != null && (followingUsers.isNotEmpty() || followingTags.isNotEmpty())) {
val event = ContactListEvent.create( val event = ContactListEvent.create(
followingUsers, followingUsers,
followingTags.filter { it != tag }, followingTags.filter { !it.equals(tag, ignoreCase = true) },
contactList.relays(), contactList.relays(),
loggedIn.privKey!! loggedIn.privKey!!
) )

6
app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
View File

@@ -257,6 +257,12 @@ class User(val pubkeyHex: String) {
} ?: false } ?: false
} }
fun isFollowingHashtagCached(tag: String): Boolean {
return latestContactList?.verifiedFollowTagSet?.let {
return tag.lowercase() in it
} ?: false
}
fun isFollowingCached(user: User): Boolean { fun isFollowingCached(user: User): Boolean {
return latestContactList?.verifiedFollowKeySet?.let { return latestContactList?.verifiedFollowKeySet?.let {
return user.pubkeyHex in it return user.pubkeyHex in it

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt
View File

@@ -107,7 +107,7 @@ fun HashtagHeader(tag: String, account: Account) {
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f)
) )
if (userFollows.isFollowingHashtag(tag)) { if (userFollows.isFollowingHashtagCached(tag)) {
UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(tag) } } UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(tag) } }
} else { } else {
FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(tag) } } FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(tag) } }