From 5a794115f4d51370c0abe9b854ccd2892e95205f Mon Sep 17 00:00:00 2001 From: Infi Date: Sat, 21 Dec 2024 22:17:41 +0100 Subject: [PATCH] fix: channel mention display Signed-off-by: Infi --- app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt | 6 ++++++ .../markdown/jbm/sequentialparsers/ChannelMentionParser.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt index 27b88c62..ff2a942f 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt +++ b/app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt @@ -89,6 +89,7 @@ import dev.snipme.highlights.model.ColorHighlight import dev.snipme.highlights.model.SyntaxLanguage import dev.snipme.highlights.model.SyntaxThemes import kotlinx.coroutines.launch +import logcat.logcat import org.intellij.markdown.MarkdownElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.ast.ASTNode @@ -241,10 +242,15 @@ private fun annotateText( background = state.colors.clickableBackground ) ) + val channel = RevoltAPI.channelCache[channelId] val mentionDisplay = channel?.name?.let { name -> "#$name" } ?: "<#$channelId>" + + appendInlineContent(JBMAnnotations.JBMBackgroundRoundingStart.tag) append(mentionDisplay) + appendInlineContent(JBMAnnotations.JBMBackgroundRoundingEnd.tag) + pop() pop() } diff --git a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt b/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt index b9a1ed14..29b7332b 100644 --- a/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt +++ b/app/src/main/java/chat/revolt/markdown/jbm/sequentialparsers/ChannelMentionParser.kt @@ -25,7 +25,7 @@ class ChannelMentionParser : SequentialParser { result.withNode( SequentialParser.Node( start..iterator.index + 1, - RSMElementTypes.USER_MENTION + RSMElementTypes.CHANNEL_MENTION ) ) }