mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-11-10 22:26:56 +01:00
Makes sure the list of geohashes and hashtags use lowercase words
This commit is contained in:
@@ -58,7 +58,7 @@ class GeohashListState(
|
|||||||
|
|
||||||
suspend fun geohashListWithBackup(note: Note): Set<String> {
|
suspend fun geohashListWithBackup(note: Note): Set<String> {
|
||||||
val event = note.event as? GeohashListEvent ?: settings.backupGeohashList
|
val event = note.event as? GeohashListEvent ?: settings.backupGeohashList
|
||||||
return event?.let { decryptionCache.geohashes(it) } ?: emptySet()
|
return event?.let { decryptionCache.geohashes(it).mapTo(mutableSetOf()) { it.lowercase() } } ?: emptySet()
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalCoroutinesApi::class)
|
@OptIn(ExperimentalCoroutinesApi::class)
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class HashtagListState(
|
|||||||
|
|
||||||
suspend fun hashtagListWithBackup(note: Note): Set<String> {
|
suspend fun hashtagListWithBackup(note: Note): Set<String> {
|
||||||
val event = note.event as? HashtagListEvent ?: settings.backupHashtagList
|
val event = note.event as? HashtagListEvent ?: settings.backupHashtagList
|
||||||
return event?.let { decryptionCache.hashtags(it) } ?: emptySet()
|
return event?.let { decryptionCache.hashtags(it).mapTo(mutableSetOf()) { it.lowercase() } } ?: emptySet()
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalCoroutinesApi::class)
|
@OptIn(ExperimentalCoroutinesApi::class)
|
||||||
@@ -71,7 +71,7 @@ class HashtagListState(
|
|||||||
}.flowOn(Dispatchers.IO)
|
}.flowOn(Dispatchers.IO)
|
||||||
.stateIn(
|
.stateIn(
|
||||||
scope,
|
scope,
|
||||||
SharingStarted.Companion.Eagerly,
|
SharingStarted.Eagerly,
|
||||||
emptySet(),
|
emptySet(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -79,9 +79,9 @@ class HashtagListState(
|
|||||||
val hashtagList = getHashtagList()
|
val hashtagList = getHashtagList()
|
||||||
|
|
||||||
return if (hashtagList == null) {
|
return if (hashtagList == null) {
|
||||||
HashtagListEvent.Companion.create(hashtags, true, signer)
|
HashtagListEvent.create(hashtags, true, signer)
|
||||||
} else {
|
} else {
|
||||||
HashtagListEvent.Companion.add(hashtagList, hashtags, true, signer)
|
HashtagListEvent.add(hashtagList, hashtags, true, signer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,9 +89,9 @@ class HashtagListState(
|
|||||||
val hashtagList = getHashtagList()
|
val hashtagList = getHashtagList()
|
||||||
|
|
||||||
return if (hashtagList == null) {
|
return if (hashtagList == null) {
|
||||||
HashtagListEvent.Companion.create(hashtag, true, signer)
|
HashtagListEvent.create(hashtag, true, signer)
|
||||||
} else {
|
} else {
|
||||||
HashtagListEvent.Companion.add(hashtagList, hashtag, true, signer)
|
HashtagListEvent.add(hashtagList, hashtag, true, signer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ class HashtagListState(
|
|||||||
val hashtagList = getHashtagList()
|
val hashtagList = getHashtagList()
|
||||||
|
|
||||||
return if (hashtagList != null) {
|
return if (hashtagList != null) {
|
||||||
HashtagListEvent.Companion.remove(hashtagList, hashtag, signer)
|
HashtagListEvent.remove(hashtagList, hashtag, signer)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user