client: delete SpecialTitleExpireTime field in GroupMemberInfo

client/decoders.go

@@ -546,7 +546,6 @@ func decodeGroupMemberListResponse(_ *QQClient, _ *network.IncomingPacketInfo, p
 			JoinTime:        m.JoinTime,
 			LastSpeakTime:   m.LastSpeakTime,
 			SpecialTitle:    m.SpecialTitle,
-			SpecialTitleExpireTime: m.SpecialTitleExpireTime,
 			ShutUpTimestamp: m.ShutUpTimestap,
 			Permission: func() MemberPermission {
 				if m.Flag == 1 {
@@ -572,6 +571,13 @@ func decodeGroupMemberInfoResponse(c *QQClient, _ *network.IncomingPacketInfo, p
 		return nil, errors.WithStack(ErrMemberNotFound)
 	}
 	group := c.FindGroup(rsp.GroupCode)
+	permission := Member
+	if rsp.MemInfo.Uin == group.OwnerUin {
+		permission = Owner
+	}
+	if rsp.MemInfo.Role == 2 {
+		permission = Administrator
+	}
 	return &GroupMemberInfo{
 		Group:         group,
 		Uin:           rsp.MemInfo.Uin,
@@ -582,16 +588,7 @@ func decodeGroupMemberInfoResponse(c *QQClient, _ *network.IncomingPacketInfo, p
 		JoinTime:      rsp.MemInfo.Join,
 		LastSpeakTime: rsp.MemInfo.LastSpeak,
 		SpecialTitle:  string(rsp.MemInfo.SpecialTitle),
-		SpecialTitleExpireTime: int64(rsp.MemInfo.SpecialTitleExpireTime),
-		Permission: func() MemberPermission {
-			if rsp.MemInfo.Uin == group.OwnerUin {
-				return Owner
-			}
-			if rsp.MemInfo.Role == 2 {
-				return Administrator
-			}
-			return Member
-		}(),
+		Permission:    permission,
 	}, nil
 }
 
@@ -713,12 +710,10 @@ func decodeOnlinePushTransPacket(c *QQClient, _ *network.IncomingPacketInfo, pay
 		}
 		if g := c.FindGroupByUin(info.GetFromUin()); g != nil {
 			if var5 == 0 && data.Len() == 1 {
-				newPermission := func() MemberPermission {
+				newPermission := Member
 				if data.ReadByte() == 1 {
-						return Administrator
+					newPermission = Administrator
 				}
-					return Member
-				}()
 				mem := g.FindMember(target)
 				if mem.Permission != newPermission {
 					old := mem.Permission
@@ -782,7 +777,7 @@ func decodeMSFOfflinePacket(c *QQClient, _ *network.IncomingPacketInfo, _ []byte
 
 // OidbSvc.0xd79
 func decodeWordSegmentation(_ *QQClient, _ *network.IncomingPacketInfo, payload []byte) (any, error) {
-	rsp := &oidb.D79RspBody{}
+	rsp := oidb.D79RspBody{}
 	err := unpackOIDBPackage(payload, &rsp)
 	if err != nil {
 		return nil, err

client/global.go

@@ -333,8 +333,20 @@ func (c *QQClient) getWebDeviceInfo() (i string) {
 	return
 }
 
+var oidbSSOPool = sync.Pool{}
+
+func getOidbSSOPackage() *oidb.OIDBSSOPkg {
+	g := oidbSSOPool.Get()
+	if g == nil {
+		return new(oidb.OIDBSSOPkg)
+	}
+	return g.(*oidb.OIDBSSOPkg)
+}
+
 func (c *QQClient) packOIDBPackage(cmd, serviceType int32, body []byte) []byte {
-	pkg := &oidb.OIDBSSOPkg{
+	pkg := getOidbSSOPackage()
+	defer oidbSSOPool.Put(pkg)
+	*pkg = oidb.OIDBSSOPkg{
 		Command:       cmd,
 		ServiceType:   serviceType,
 		Bodybuffer:    body,
@@ -354,7 +366,8 @@ func (c *QQClient) packOIDBPackageProto(cmd, serviceType int32, msg proto.Messag
 }
 
 func unpackOIDBPackage(payload []byte, rsp proto.Message) error {
-	pkg := new(oidb.OIDBSSOPkg)
+	pkg := getOidbSSOPackage()
+	defer oidbSSOPool.Put(pkg)
 	if err := proto.Unmarshal(payload, pkg); err != nil {
 		return errors.Wrap(err, "failed to unmarshal protobuf message")
 	}

client/group_info.go

@@ -45,16 +45,15 @@ type (
 	GroupMemberInfo struct {
 		Group           *GroupInfo
 		Uin             int64
-		Gender                 byte
 		Nickname        string
 		CardName        string
-		Level                  uint16
 		JoinTime        int64
 		LastSpeakTime   int64
 		SpecialTitle    string
-		SpecialTitleExpireTime int64
 		ShutUpTimestamp int64
 		Permission      MemberPermission
+		Level           uint16
+		Gender          byte
 	}
 
 	// GroupSearchInfo 通过搜索得到的群信息