highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-07-28 13:42:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes redirection of routeFor when passing an App Definition Event.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-17 18:05:17 -04:00
parent 4c1cd1c9ab
commit d6988ad4e1
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/RouteMaker.kt
View File

@@ -26,6 +26,7 @@ import com.vitorpamplona.amethyst.model.User
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.quartz.encoders.HexKey import com.vitorpamplona.quartz.encoders.HexKey
import com.vitorpamplona.quartz.events.AddressableEvent import com.vitorpamplona.quartz.events.AddressableEvent
import com.vitorpamplona.quartz.events.AppDefinitionEvent
import com.vitorpamplona.quartz.events.ChannelCreateEvent import com.vitorpamplona.quartz.events.ChannelCreateEvent
import com.vitorpamplona.quartz.events.ChatroomKey import com.vitorpamplona.quartz.events.ChatroomKey
import com.vitorpamplona.quartz.events.ChatroomKeyable import com.vitorpamplona.quartz.events.ChatroomKeyable
@@ -75,6 +76,8 @@ fun routeFor(
} else { } else {
return "Note/${URLEncoder.encode(noteEvent.id(), "utf-8")}" return "Note/${URLEncoder.encode(noteEvent.id(), "utf-8")}"
} }
} else if (noteEvent is AppDefinitionEvent) {
return "ContentDiscovery/${noteEvent.id}"
} else if (noteEvent is IsInPublicChatChannel) { } else if (noteEvent is IsInPublicChatChannel) {
noteEvent.channel()?.let { noteEvent.channel()?.let {
return "Channel/$it" return "Channel/$it"

19
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
View File

@@ -424,18 +424,13 @@ fun ClickableNote(
.combinedClickable( .combinedClickable(
onClick = { onClick = {
scope.launch { scope.launch {
if (baseNote.event is AppDefinitionEvent) { val redirectToNote =
// nav(Route.ContentDiscovery.route + "/${(baseNote.event as AppDefinitionEvent).pubKey()}") if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
nav("ContentDiscovery/${(baseNote.event as AppDefinitionEvent).pubKey()}") baseNote.replyTo?.lastOrNull() ?: baseNote
} else { } else {
val redirectToNote = baseNote
if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) { }
baseNote.replyTo?.lastOrNull() ?: baseNote routeFor(redirectToNote, accountViewModel.userProfile())?.let { nav(it) }
} else {
baseNote
}
routeFor(redirectToNote, accountViewModel.userProfile())?.let { nav(it) }
}
} }
}, },
onLongClick = showPopup, onLongClick = showPopup,