Skip to content

Commit 1da3a4a

Browse files
authored
Merge pull request #1141 from DimensionDev/bugfix/misskey_emoji_picker
fix emoji picker input for misskey
2 parents 667df45 + de9d7bc commit 1da3a4a

File tree

2 files changed

+2
-2
lines changed
  • app/src/main/java/dev/dimension/flare/ui/screen/compose
  • shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper

2 files changed

+2
-2
lines changed

app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ private fun composePresenter(
824824

825825
fun selectEmoji(emoji: UiEmoji) {
826826
textFieldState.edit {
827-
append(" :${emoji.shortcode}: ")
827+
append(" ${emoji.shortcode} ")
828828
}
829829
}
830830

shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ internal fun DbEmoji.toUi(): List<UiEmoji> =
607607
is EmojiContent.Mastodon -> {
608608
content.data.filter { it.visibleInPicker == true }.map {
609609
UiEmoji(
610-
shortcode = it.shortcode.orEmpty(),
610+
shortcode = it.shortcode.orEmpty().let { if (!it.startsWith(':') && !it.endsWith(':')) ":$it:" else it },
611611
url = it.url.orEmpty(),
612612
category = it.category.orEmpty(),
613613
searchKeywords =

0 commit comments

Comments
 (0)