github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 04:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix groupCard charset encode, fixed

Browse Source
This commit is contained in:
ryoii 2020-04-04 06:11:19 +08:00
parent 18c5911666
commit 2a7496c0b5
3 changed files with 6 additions and 10 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid
network/protocol/packet
chat
TroopManagement.kt
login
ConfigPushSvc.kt
utils/io/serialization
utils.kt

7
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
View File

@ -26,7 +26,6 @@ import net.mamoe.mirai.qqandroid.network.protocol.data.proto.*
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
import net.mamoe.mirai.qqandroid.utils.encodeToString
import net.mamoe.mirai.qqandroid.utils.io.serialization.*
import net.mamoe.mirai.utils.daysToSeconds
import net.mamoe.mirai.data.GroupInfo as MiraiGroupInfo
@ -413,15 +412,13 @@ internal class TroopManagement {
gender = 0,
dwuin = member.id,
dwFlag = 31,
sName = newName.toByteArray(CharsetUTF8)
.encodeToString(CharsetGBK),
sName = newName,
sPhone = "",
sEmail = "",
sRemark = ""
)
)
),
JceCharset.GBK
)
)
)
)

3
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/ConfigPushSvc.kt
View File

@ -87,8 +87,7 @@ msfwifi.3g.qq.com ?
jcebuf = if (packet.type == 3) packet.jcebuf else null
)
)
),
charset = JceCharset.UTF8
)
)
// writePacket(this.build().debugPrintThis())
}

6
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/utils.kt
View File

@ -37,7 +37,7 @@ internal fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrat
internal fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
serializer: SerializationStrategy<T>,
struct: T,
charset: JceCharset = JceCharset.GBK
charset: JceCharset = JceCharset.UTF8
) {
Jce.byCharSet(charset).dumpTo(serializer, struct, this)
}
@ -91,7 +91,7 @@ internal fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: Strin
})
}
internal fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray =
internal fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.UTF8): ByteArray =
Jce.byCharSet(c).dump(serializer, this)
internal fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
@ -139,7 +139,7 @@ internal fun <T : JceStruct> jceRequestSBuffer(name: String, serializer: Seriali
name,
serializer,
jceStruct,
JceCharset.GBK
JceCharset.UTF8
)
}