code ...

LagrangeDev · Feb 17, 2025 · ee5d35d · ee5d35d
1 parent 58a6b3f
commit ee5d35d
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 48 deletions.
diff --git a/client/message.go b/client/message.go
@@ -72,7 +72,6 @@ func (c *QQClient) SendGroupMessage(groupUin uint32, elements []message2.IMessag
 			UID:      c.GetUID(c.Uin),
 			Nickname: c.NickName(),
 			CardName: minfo.MemberCard,
-			//AnonymousInfo: nil,
 			IsFriend: true,
 		},
 		Time:           ret.Timestamp1,
@@ -109,7 +108,6 @@ func (c *QQClient) SendPrivateMessage(uin uint32, elements []message2.IMessageEl
 			Uin:      c.Uin,
 			UID:      c.GetUID(c.Uin),
 			Nickname: c.NickName(),
-			//AnonymousInfo: nil,
 			IsFriend: true,
 		},
 		Elements: elements,
@@ -140,7 +138,6 @@ func (c *QQClient) SendTempMessage(groupUin uint32, uin uint32, elements []messa
 			Uin:      c.Uin,
 			UID:      c.GetUID(c.Uin),
 			Nickname: c.NickName(),
-			//AnonymousInfo: nil,
 			IsFriend: true,
 		},
 		Elements: elements,

diff --git a/client/operation.go b/client/operation.go
@@ -477,6 +477,21 @@ func (c *QQClient) GetGroupRecordURL(groupUin uint32, node *oidb.IndexNode) (str
 	return oidb2.ParseGroupRecordDownloadResp(resp)
 }
 
+/* king bug ?
+func (c *QQClient) GetVideoNode() *oidb.IndexNode {
+	return &oidb.IndexNode{
+		Info: &oidb2.FileInfo{
+			FileName: video.FileName,
+			FileSize: video.FileSize,
+			FileSha1: video.FileSha1,
+			FileHash: video.FileMd5,
+		},
+		FileUuid: video.FileUuid,
+		StoreId : 1, // 0旧服务器 1为nt服务器
+	},
+}
+*/
+
 // GetPrivateVideoURL 获取私聊视频下载链接
 func (c *QQClient) GetPrivateVideoURL(node *oidb.IndexNode) (string, error) {
 	pkt, err := oidb2.BuildPrivateVideoDownloadReq(c.Sig().UID, node)

diff --git a/client/packets/pb/action/action.pb.go b/client/packets/pb/action/action.pb.go
diff --git a/client/packets/pb/message/element.pb.go b/client/packets/pb/message/element.pb.go
diff --git a/client/packets/pb/message/element.proto b/client/packets/pb/message/element.proto
@@ -15,7 +15,7 @@ message Elem {
   optional GroupFile GroupFile = 13;
   optional ExtraInfo ExtraInfo = 16;
   optional VideoFile VideoFile = 19;
-  //optional AnonymousGroupMessage AnonymousGroupMessage = 21;
+  optional AnonymousGroupMessage AnonymousGroupMessage = 21;
   optional QQWalletMsg QQWalletMsg = 24;
   optional CustomElem CustomElem = 31;
   optional GeneralFlags GeneralFlags = 37;
@@ -24,7 +24,6 @@ message Elem {
   optional CommonElem CommonElem = 53;
 }
 
-/*
 message AnonymousGroupMessage {
   int32 Flags = 1;
   bytes AnonId = 2;
@@ -34,7 +33,6 @@ message AnonymousGroupMessage {
   int32 BubbleId = 6;
   bytes RankColor = 7;
 }
-*/
 
 message CommonElem {
   int32 ServiceType = 1;

diff --git a/client/packets/pb/message/message.pb.go b/client/packets/pb/message/message.pb.go
diff --git a/client/packets/pb/service/highway/highway.pb.go b/client/packets/pb/service/highway/highway.pb.go
diff --git a/message/message.go b/message/message.go
@@ -81,28 +81,16 @@ type (
 		UID      string
 		Nickname string
 		CardName string
-		//AnonymousInfo *AnonymousInfo
 		IsFriend bool
 	}
-	/*
-		AnonymousInfo struct {
-			AnonymousID   string
-			AnonymousNick string
-		}
-	*/
+
 	IMessageElement interface {
 		Type() ElementType
 	}
 
 	ElementType int
 )
 
-/*
-func (s *Sender) IsAnonymous() bool {
-	return s.Uin == 80000000
-}
-*/
-
 func ParsePrivateMessage(msg *message.PushMsgBody) *PrivateMessage {
 	prvMsg := &PrivateMessage{
 		ID:         msg.ContentHead.Sequence.Unwrap(),
@@ -173,15 +161,14 @@ func ParseMessageElements(msg []*message.Elem) []IMessageElement {
 		}
 
 		if elem.Text != nil {
-			switch {
-			case len(elem.Text.Attr6Buf) > 0:
+			if len(elem.Text.Attr6Buf) > 0 {
 				att6 := binary.NewReader(elem.Text.Attr6Buf)
 				att6.SkipBytes(7)
 				target := att6.ReadU32()
 				at := NewAt(target, elem.Text.Str.Unwrap())
 				at.SubType = AtTypeGroupMember
 				res = append(res, at)
-			default:
+			} else {
 				res = append(res, NewText(func() string {
 					if strings.Contains(elem.Text.Str.Unwrap(), "\r") && !strings.Contains(elem.Text.Str.Unwrap(), "\r\n") {
 						return strings.ReplaceAll(elem.Text.Str.Unwrap(), "\r", "\r\n")
@@ -452,8 +439,7 @@ func ParseMessageBody(body *message.MessageBody, isGroup bool) []IMessageElement
 	if body != nil {
 		if body.RichText != nil && body.RichText.Ptt != nil {
 			ptt := body.RichText.Ptt
-			switch {
-			case isGroup && ptt.FileId != 0:
+			if isGroup && ptt.FileId != 0 {
 				res = append(res, &VoiceElement{
 					Name: ptt.FileName,
 					UUID: ptt.FileUuid,
@@ -462,7 +448,7 @@ func ParseMessageBody(body *message.MessageBody, isGroup bool) []IMessageElement
 						FileUuid: ptt.GroupFileKey,
 					},
 				})
-			case !isGroup:
+			} else if !isGroup {
 				res = append(res, &VoiceElement{
 					Name: ptt.FileName,
 					UUID: ptt.FileUuid,