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

Fixes Channel @tag

Browse Source
This commit is contained in:
Vitor Pamplona
2023-01-31 20:50:56 -03:00
parent 75cb313886
commit 4303e6040c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
+1 -1
View File
@@ -11,7 +11,7 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {
var channel: com.vitorpamplona.amethyst.model.Channel? = null var channel: com.vitorpamplona.amethyst.model.Channel? = null
fun loadMessagesBetween(channelId: String) { fun loadMessagesBetween(channelId: String) {
channel = LocalCache.channels[channelId] channel = LocalCache.getOrCreateChannel(channelId)
resetFilters() resetFilters()
} }
app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
+3 -3
View File
@@ -23,7 +23,7 @@ fun ClickableRoute(
navController: NavController navController: NavController
) { ) {
if (nip19.type == Nip19.Type.USER) { if (nip19.type == Nip19.Type.USER) {
val userBase = LocalCache.getOrCreateUser(nip19.hex.toByteArray()) val userBase = LocalCache.getOrCreateUser(nip19.hex)
val userState by userBase.live.observeAsState() val userState by userBase.live.observeAsState()
val user = userState?.user ?: return val user = userState?.user ?: return
@@ -48,8 +48,8 @@ fun ClickableRoute(
) )
} else if (note.channel != null) { } else if (note.channel != null) {
ClickableText( ClickableText(
text = AnnotatedString("@${note.channel} "), text = AnnotatedString("@${note.channel?.toBestDisplayName()} "),
onClick = { navController.navigate("Channel/${nip19.hex}") }, onClick = { navController.navigate("Channel/${note.channel?.idHex}") },
style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary) style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
) )
} else { } else {