From b7db927f2802b2f2162097a5b7fea1b9f8c63413 Mon Sep 17 00:00:00 2001 From: sandtechnology Date: Sun, 20 Dec 2020 12:03:57 +0800 Subject: [PATCH] Fix naming inconsistent --- .../src/commonMain/kotlin/message/data/Face.kt | 10 ++++++---- .../kotlin/message.data/ConstrainSingleTest.kt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/Face.kt b/mirai-core-api/src/commonMain/kotlin/message/data/Face.kt index be245e06b..8f444ccd9 100644 --- a/mirai-core-api/src/commonMain/kotlin/message/data/Face.kt +++ b/mirai-core-api/src/commonMain/kotlin/message/data/Face.kt @@ -221,8 +221,10 @@ public data class Face(public val id: Int) : // used in delegation public const val 差劲: Int = CHA_JIN public const val AI_NI: Int = 122 public const val 爱你: Int = AI_NI - public const val NO: Int = 123 - public const val OK: Int = 124 + public const val BU: Int = 123 + public const val 不: Int = BU + public const val HAO: Int = 124 + public const val 好: Int = HAO public const val ZHUAN_QUAN: Int = 125 public const val 转圈: Int = ZHUAN_QUAN public const val KE_TOU: Int = 126 @@ -561,8 +563,8 @@ public data class Face(public val id: Int) : // used in delegation names[QUAN_TOU] = "[拳头]" names[CHA_JIN] = "[差劲]" names[AI_NI] = "[爱你]" - names[NO] = "[NO]" - names[OK] = "[OK]" + names[BU] = "[不]" + names[HAO] = "[好]" names[ZHUAN_QUAN] = "[转圈]" names[KE_TOU] = "[磕头]" names[HUI_TOU] = "[回头]" diff --git a/mirai-core-api/src/commonTest/kotlin/message.data/ConstrainSingleTest.kt b/mirai-core-api/src/commonTest/kotlin/message.data/ConstrainSingleTest.kt index 5bbcd6281..528e3a2cc 100644 --- a/mirai-core-api/src/commonTest/kotlin/message.data/ConstrainSingleTest.kt +++ b/mirai-core-api/src/commonTest/kotlin/message.data/ConstrainSingleTest.kt @@ -59,7 +59,7 @@ internal class ConstrainSingleTest { val result = buildMessageChain { add(" ") - add(Face(Face.OK)) + add(Face(Face.HAO)) add(TestConstrainSingleMessage()) add( PlainText("ss")