add: protocol value

cssxsh · Jun 24, 2023 · 6497b3b · 6497b3b
1 parent 19901b2
commit 6497b3b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt
@@ -966,6 +966,7 @@ internal fun TlvMapWriter.t548(
 
 internal fun TlvMapWriter.t544ForToken( // 1348
     uin: Long,
+    protocol: BotConfiguration.MiraiProtocol,
     guid: ByteArray,
     sdkVersion: String,
     subCommandId: Int,
@@ -984,6 +985,7 @@ internal fun TlvMapWriter.t544ForToken( // 1348
         }.use { dataIn ->
             service.encryptTlv(EncryptServiceContext(uin, buildTypeSafeMap {
                 set(EncryptServiceContext.KEY_COMMAND_STR, commandStr)
+                set(EncryptServiceContext.KEY_BOT_PROTOCOL, protocol)
             }), 0x544, dataIn.readBytes())
         }.let { result ->
             writeFully(result ?: "".toByteArray()) // Empty str means native throws exception
@@ -993,6 +995,7 @@ internal fun TlvMapWriter.t544ForToken( // 1348
 
 internal fun TlvMapWriter.t544ForVerify( // 1348
     uin: Long,
+    protocol: BotConfiguration.MiraiProtocol,
     guid: ByteArray,
     sdkVersion: String,
     subCommandId: Int,
@@ -1008,6 +1011,7 @@ internal fun TlvMapWriter.t544ForVerify( // 1348
         }.use { dataIn ->
             service.encryptTlv(EncryptServiceContext(uin, buildTypeSafeMap {
                 set(EncryptServiceContext.KEY_COMMAND_STR, commandStr)
+                set(EncryptServiceContext.KEY_BOT_PROTOCOL, protocol)
             }), 0x544, dataIn.readBytes())
         }.let { result ->
             writeFully(result ?: "".toByteArray()) // Empty str means native throws exception

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin10.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin10.kt
@@ -88,6 +88,7 @@ internal object WtLogin10 : WtLoginExt {
                     if (client.useAndroid) {
                         t544ForToken(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 10,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin15.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin15.kt
@@ -138,6 +138,7 @@ internal object WtLogin15 : WtLoginExt {
                 if (client.useAndroid) {
                     t544ForToken(
                         uin = client.uin,
+                        protocol = client.bot.configuration.protocol,
                         guid = client.device.guid,
                         sdkVersion = client.sdkVersion,
                         subCommandId = 15,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin2.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin2.kt
@@ -34,6 +34,7 @@ internal object WtLogin2 : WtLoginExt {
                     if (client.useAndroid) {
                         t544ForVerify(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 2,
@@ -63,6 +64,7 @@ internal object WtLogin2 : WtLoginExt {
                     if (client.useAndroid) {
                         t544ForVerify(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 2,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin7.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin7.kt
@@ -44,6 +44,7 @@ internal object WtLogin7 : WtLoginExt {
                     if (client.useAndroid) {
                         t544ForVerify(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 7,

diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
@@ -137,6 +137,7 @@ internal object WtLogin9 : WtLoginExt {
                     if (client.useAndroid) {
                         t544ForToken(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 9,
@@ -147,6 +148,7 @@ internal object WtLogin9 : WtLoginExt {
                     if (client.usePC) {
                         t544ForToken(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 9,
@@ -211,6 +213,7 @@ internal object WtLogin9 : WtLoginExt {
                     if (client.usePC) {
                         t544ForToken(
                             uin = client.uin,
+                            protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
                             sdkVersion = client.sdkVersion,
                             subCommandId = 9,