From cdf8347c183e68d7fba13cff6c0c2bb8a695676c Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Thu, 20 Feb 2020 23:38:34 +0800
Subject: [PATCH] try to fix Chinese Groupcard support
---
.../src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt | 1 -
.../mirai/qqandroid/network/protocol/data/jce/FriendList.kt | 2 ++
.../qqandroid/network/protocol/packet/chat/TroopManagement.kt | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
index f1049b290..6a5e16ad3 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
@@ -305,7 +305,6 @@ object MiraiConsole {
if (!CommandManager.runCommand(fullCommand)) {
logger("未知指令 $fullCommand")
}
-
}
}
}
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
index 27e19dd94..ad861f561 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
@@ -9,9 +9,11 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce
+import kotlinx.io.core.toByteArray
import kotlinx.serialization.SerialId
import kotlinx.serialization.Serializable
import net.mamoe.mirai.qqandroid.io.JceStruct
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
@Serializable
internal class ModifyGroupCardReq(
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
index 3d12d9022..906a5f4e4 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
@@ -410,7 +410,7 @@ internal class TroopManagement {
gender = 0,
dwuin = member.id,
dwFlag = 31,
- sName = newName.toUtf8Bytes().encodeToString(charset = CharsetGBK),
+ sName = newName.toByteArray(CharsetUTF8).encodeToString(CharsetGBK),
sPhone = "",
sEmail = "",
sRemark = ""