From 7d0b60271e65ad87d9d67a5534c688052f40e49d Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchi@buaa.edu.cn>
Date: Thu, 14 Mar 2024 18:25:01 +0800
Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20fix=20=E7=BE=A4=E8=81=8A=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt  | 3 ++-
 .../qqinterface/servlet/transfile/NtV2RichMediaSvc.kt    | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt
index bf8fbbc..c1c4243 100644
--- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/maker/ElemMaker.kt
@@ -12,6 +12,7 @@ import moe.fuqiuluo.qqinterface.servlet.ark.WeatherSvc
 import moe.fuqiuluo.qqinterface.servlet.msg.toJson
 import moe.fuqiuluo.qqinterface.servlet.msg.toSegments
 import moe.fuqiuluo.qqinterface.servlet.transfile.NtV2RichMediaSvc
+import moe.fuqiuluo.qqinterface.servlet.transfile.NtV2RichMediaSvc.fetchGroupResUploadTo
 import moe.fuqiuluo.shamrock.helper.*
 import moe.fuqiuluo.shamrock.helper.MessageHelper.messageArrayToRichText
 import moe.fuqiuluo.shamrock.helper.MessageHelper.obtainMessageTypeByDetailType
@@ -271,7 +272,7 @@ internal class ElemMaker {
                 when(chatType) {
                     MsgConstant.KCHATTYPEGROUP -> {
                         sceneType = 2u
-                        grp = GroupUserInfo(peerId.toULong())
+                        grp = GroupUserInfo(fetchGroupResUploadTo().toULong())
                     }
                     MsgConstant.KCHATTYPEC2C -> {
                         sceneType = 1u
diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/NtV2RichMediaSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/NtV2RichMediaSvc.kt
index f355ad7..a591ed3 100644
--- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/NtV2RichMediaSvc.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/transfile/NtV2RichMediaSvc.kt
@@ -19,7 +19,6 @@ import kotlinx.coroutines.withTimeoutOrNull
 import moe.fuqiuluo.qqinterface.servlet.BaseSvc
 import moe.fuqiuluo.qqinterface.servlet.TicketSvc
 import moe.fuqiuluo.qqinterface.servlet.transfile.data.TryUpPicData
-import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.helper.MessageHelper
 import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
 import moe.fuqiuluo.shamrock.tools.hex2ByteArray
@@ -62,7 +61,7 @@ import kotlin.time.Duration
 internal object NtV2RichMediaSvc: BaseSvc() {
     private val requestIdSeq = atomic(2L)
 
-    private fun fetchGroupResUploadTo(): String {
+    fun fetchGroupResUploadTo(): String {
         return ShamrockConfig.getUpResGroup().ifEmpty { "100000000" }
     }
 
@@ -462,12 +461,12 @@ internal object NtV2RichMediaSvc: BaseSvc() {
                 tryFastUploadCompleted = true,
                 srvSendMsg = false,
                 clientRandomId = Random.nextULong(),
-                compatQMsgSceneType = 1u,
+                compatQMsgSceneType = 2u,
                 clientSeq = Random.nextUInt(),
-                noNeedCompatMsg = false
+                noNeedCompatMsg = true
             )
         ).toByteArray()
-        val buffer = sendOidbAW("OidbSvcTrpcTcp.0x11c5_100", 4549, 100, req, true, timeout = 3_000)?.slice(4)
+        val buffer = sendOidbAW("OidbSvcTrpcTcp.0x11c4_100", 4548, 100, req, true, timeout = 3_000)?.slice(4)
             ?: return Result.failure(Exception("no response: timeout"))
         val rspBuffer = buffer.decodeProtobuf<TrpcOidb>().buffer
         val rsp = rspBuffer.decodeProtobuf<NtV2RichMediaRsp>()