feat: 图片发送支持subtype

LagrangeDev · Dec 8, 2024 · 0c9336b · 0c9336b
1 parent 988dab1
commit 0c9336b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/client/packets/oidb/group_image_upload.go b/client/packets/oidb/group_image_upload.go
@@ -23,12 +23,6 @@ func BuildGroupImageUploadReq(groupUin uint32, image *message.ImageElement) (*Pa
 	}
 	imageExt := format.String()
 
-	hexString := "0800180020004a00500062009201009a0100aa010c080012001800200028003a00"
-	bytesPbReserveTroop, err := hex.DecodeString(hexString)
-	if err != nil {
-		return nil, err
-	}
-
 	body := &oidb.NTV2RichMediaReq{
 		ReqHead: &oidb.MultiMediaReqHead{
 			Common: &oidb.CommonHead{
@@ -75,8 +69,12 @@ func BuildGroupImageUploadReq(groupUin uint32, image *message.ImageElement) (*Pa
 			CompatQMsgSceneType:    2,
 			ExtBizInfo: &oidb.ExtBizInfo{
 				Pic: &oidb.PicExtBizInfo{
-					BytesPbReserveTroop: bytesPbReserveTroop,
-					TextSummary:         image.Summary,
+					BizType:     uint32(image.SubType),
+					TextSummary: image.Summary,
+					ExtData: &oidb.PicExtData{
+						SubType:     uint32(image.SubType),
+						TextSummary: image.Summary,
+					},
 				},
 				Video: &oidb.VideoExtBizInfo{
 					BytesPbReserve: []byte{},

diff --git a/client/packets/oidb/private_image_upload.go b/client/packets/oidb/private_image_upload.go
@@ -23,12 +23,6 @@ func BuildPrivateImageUploadReq(targetUID string, image *message.ImageElement) (
 	}
 	imageExt := format.String()
 
-	hexString := "0800180020004200500062009201009a0100a2010c080012001800200028003a00"
-	bytesPbReserveC2c, err := hex.DecodeString(hexString)
-	if err != nil {
-		return nil, err
-	}
-
 	body := &oidb.NTV2RichMediaReq{
 		ReqHead: &oidb.MultiMediaReqHead{
 			Common: &oidb.CommonHead{
@@ -76,8 +70,12 @@ func BuildPrivateImageUploadReq(targetUID string, image *message.ImageElement) (
 			CompatQMsgSceneType:    1,
 			ExtBizInfo: &oidb.ExtBizInfo{
 				Pic: &oidb.PicExtBizInfo{
-					BytesPbReserveC2C: bytesPbReserveC2c,
-					TextSummary:       image.Summary,
+					BizType:     uint32(image.SubType),
+					TextSummary: image.Summary,
+					ExtData: &oidb.PicExtData{
+						SubType:     uint32(image.SubType),
+						TextSummary: image.Summary,
+					},
 				},
 				Video: &oidb.VideoExtBizInfo{
 					BytesPbReserve: []byte{},

diff --git a/client/packets/pb/service/oidb/NTV2RichMediaReq.pb.go b/client/packets/pb/service/oidb/NTV2RichMediaReq.pb.go
diff --git a/client/packets/pb/service/oidb/NTV2RichMediaReq.proto b/client/packets/pb/service/oidb/NTV2RichMediaReq.proto
@@ -167,12 +167,17 @@ message PicExtBizInfo {
   uint32 BizType = 1;
   string TextSummary = 2;
   bytes BytesPbReserveC2c = 11;
-  bytes BytesPbReserveTroop = 12;
+  PicExtData ExtData = 12;
   uint32 FromScene = 1001;
   uint32 ToScene = 1002;
   uint32 OldFileId = 1003;
 }
 
+message PicExtData {
+  uint32 SubType = 1;
+  string TextSummary = 9;
+}
+
 message DownloadSafeReq {
   IndexNode Index = 1;
 }