highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-08 11:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes crash when MuteList has e tags that are not valid hexes

Browse Source
This commit is contained in:
Vitor Pamplona 2024-02-12 14:21:32 -05:00
parent c0a9ce8e21
commit 5109b65e37
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt
View File

@ -20,9 +20,11 @@
*/
package com.vitorpamplona.amethyst.ui.dal
import android.util.Log
import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.User
import kotlinx.coroutines.CancellationException
class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
override fun feedKey(): String {
@ -34,7 +36,15 @@ class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
}
override fun feed(): List<User> {
return account.flowHiddenUsers.value.hiddenUsers.reversed().map { LocalCache.getOrCreateUser(it) }
return account.flowHiddenUsers.value.hiddenUsers.reversed().mapNotNull {
try {
LocalCache.getOrCreateUser(it)
} catch (e: Exception) {
if (e is CancellationException) throw e
Log.e("HiddenAccountsFeedFilter", "Failed to parse key $it")
null
}
}
}
}

12
quartz/src/main/java/com/vitorpamplona/quartz/events/GeneralListEvent.kt
View File

@ -28,6 +28,7 @@ import com.vitorpamplona.quartz.encoders.HexKey
import com.vitorpamplona.quartz.signers.NostrSigner
import kotlinx.collections.immutable.ImmutableSet
import kotlinx.collections.immutable.toImmutableSet
import java.util.HashSet
@Immutable
abstract class GeneralListEvent(
@ -61,12 +62,13 @@ abstract class GeneralListEvent(
key: String,
privateTags: Array<Array<String>>?,
): ImmutableSet<String> {
val privateUserList =
privateTags?.let { it.filter { it.size > 1 && it[0] == key }.map { it[1] }.toSet() }
?: emptySet()
val publicUserList = tags.filter { it.size > 1 && it[0] == key }.map { it[1] }.toSet()
val result = HashSet<String>(tags.size + (privateTags?.size ?: 0))
return (privateUserList + publicUserList).toImmutableSet()
privateTags?.let { it.filter { it.size > 1 && it[0] == key }.mapTo(result) { it[1] } }
tags.filter { it.size > 1 && it[0] == key }.mapTo(result) { it[1] }
return result.toImmutableSet()
}
fun isTagged(