Use unicode for default emojis

freya022 · Oct 27, 2024 · 4d51f53 · 4d51f53
1 parent fe32fc6
commit 4d51f53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BTextConfig.kt b/src/main/kotlin/io/github/freya022/botcommands/api/core/config/BTextConfig.kt
@@ -6,7 +6,6 @@ import io.github.freya022.botcommands.api.commands.text.annotations.RequiresText
 import io.github.freya022.botcommands.api.core.service.annotations.InjectedService
 import io.github.freya022.botcommands.api.core.utils.toImmutableList
 import io.github.freya022.botcommands.api.localization.DefaultMessages
-import io.github.freya022.botcommands.api.utils.EmojiUtils
 import io.github.freya022.botcommands.internal.core.config.ConfigDSL
 import io.github.freya022.botcommands.internal.core.config.ConfigurationValue
 import net.dv8tion.jda.api.entities.emoji.Emoji
@@ -107,7 +106,7 @@ class BTextConfigBuilder internal constructor() : BTextConfig {
         set(value) {
             dmClosedEmojiSupplier = { value }
         }
-    var dmClosedEmojiSupplier: () -> Emoji = { EmojiUtils.resolveJDAEmoji("mailbox_closed") }
+    var dmClosedEmojiSupplier: () -> Emoji = { Emoji.fromUnicode("\uD83D\uDCEA") } // mailbox_closed
 
     @JvmSynthetic
     internal fun build() = object : BTextConfig {

diff --git a/...main/kotlin/io/github/freya022/botcommands/internal/commands/text/BaseCommandEventImpl.kt b/...main/kotlin/io/github/freya022/botcommands/internal/commands/text/BaseCommandEventImpl.kt
@@ -5,14 +5,14 @@ import io.github.freya022.botcommands.api.commands.text.BaseCommandEvent
 import io.github.freya022.botcommands.api.core.BContext
 import io.github.freya022.botcommands.api.core.utils.loggerOf
 import io.github.freya022.botcommands.api.localization.text.LocalizableTextCommand
-import io.github.freya022.botcommands.api.utils.EmojiUtils
 import io.github.oshai.kotlinlogging.KotlinLogging
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.Permission.MESSAGE_ADD_REACTION
 import net.dv8tion.jda.api.Permission.MESSAGE_HISTORY
 import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.MessageEmbed
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
+import net.dv8tion.jda.api.entities.emoji.Emoji
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.requests.RestAction
 import net.dv8tion.jda.api.requests.restaction.MessageCreateAction
@@ -23,8 +23,8 @@ import javax.annotation.CheckReturnValue
 
 private val logger = KotlinLogging.loggerOf<BaseCommandEvent>()
 
-private val SUCCESS by lazy { EmojiUtils.resolveJDAEmoji("white_check_mark") }
-private val ERROR by lazy { EmojiUtils.resolveJDAEmoji("x") }
+private val SUCCESS = Emoji.fromUnicode("✅") // white_check_mark
+private val ERROR = Emoji.fromUnicode("❌") // x
 
 internal open class BaseCommandEventImpl(
     private val context: BContext,