shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00
Code Issues Projects Releases Wiki Activity

update troopSystemMessageDecoder.

Browse Source
This commit is contained in:
Mrs4s 2021-03-02 09:45:53 +08:00
parent 6687d1e0c0
commit 4f5e890ec6
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client/c2c_processor.go
View File

@ -2,6 +2,7 @@ package client
import ( import (
"fmt" "fmt"
"github.com/Mrs4s/MiraiGo/binary"
"sync/atomic" "sync/atomic"
"time" "time"
@ -11,7 +12,7 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
var c2cDecoders = map[int32]func(*QQClient, *msg.Message){ var c2cDecoders = map[int32]func(*QQClient, *msg.Message, *c2cExtraOption){
33: troopAddMemberBroadcastDecoder, 33: troopAddMemberBroadcastDecoder,
35: troopSystemMessageDecoder, 36: troopSystemMessageDecoder, 37: troopSystemMessageDecoder, 35: troopSystemMessageDecoder, 36: troopSystemMessageDecoder, 37: troopSystemMessageDecoder,
45: troopSystemMessageDecoder, 46: troopSystemMessageDecoder, 84: troopSystemMessageDecoder, 45: troopSystemMessageDecoder, 46: troopSystemMessageDecoder, 84: troopSystemMessageDecoder,
@ -23,7 +24,11 @@ var c2cDecoders = map[int32]func(*QQClient, *msg.Message){
529: msgType0x211Decoder, 529: msgType0x211Decoder,
} }
func (c *QQClient) c2cMessageSyncProcessor(rsp *msg.GetMessageResponse) { type c2cExtraOption struct {
UsedRegProxy bool
}
func (c *QQClient) c2cMessageSyncProcessor(rsp *msg.GetMessageResponse, opt *c2cExtraOption) {
c.syncCookie = rsp.SyncCookie c.syncCookie = rsp.SyncCookie
c.pubAccountCookie = rsp.PubAccountCookie c.pubAccountCookie = rsp.PubAccountCookie
c.msgCtrlBuf = rsp.MsgCtrlBuf c.msgCtrlBuf = rsp.MsgCtrlBuf
@ -54,7 +59,7 @@ func (c *QQClient) c2cMessageSyncProcessor(rsp *msg.GetMessageResponse) {
} }
c.msgSvcCache.Add(strKey, "", time.Minute*5) c.msgSvcCache.Add(strKey, "", time.Minute*5)
if decoder, ok := c2cDecoders[pMsg.Head.GetMsgType()]; ok { if decoder, ok := c2cDecoders[pMsg.Head.GetMsgType()]; ok {
decoder(c, pMsg) decoder(c, pMsg, opt)
} }
/* /*
switch pMsg.Head.GetMsgType() { switch pMsg.Head.GetMsgType() {
@ -148,7 +153,7 @@ func (c *QQClient) c2cMessageSyncProcessor(rsp *msg.GetMessageResponse) {
} }
} }
func privateMessageDecoder(c *QQClient, pMsg *msg.Message) { func privateMessageDecoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
if pMsg.Head.GetFromUin() == c.Uin { if pMsg.Head.GetFromUin() == c.Uin {
for { for {
frdSeq := atomic.LoadInt32(&c.friendSeq) frdSeq := atomic.LoadInt32(&c.friendSeq)
@ -167,7 +172,7 @@ func privateMessageDecoder(c *QQClient, pMsg *msg.Message) {
c.dispatchFriendMessage(c.parsePrivateMessage(pMsg)) c.dispatchFriendMessage(c.parsePrivateMessage(pMsg))
} }
func tempSessionDecoder(c *QQClient, pMsg *msg.Message) { func tempSessionDecoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
if pMsg.Head.C2CTmpMsgHead == nil { if pMsg.Head.C2CTmpMsgHead == nil {
return return
} }
@ -181,7 +186,7 @@ func tempSessionDecoder(c *QQClient, pMsg *msg.Message) {
c.dispatchTempMessage(c.parseTempMessage(pMsg)) c.dispatchTempMessage(c.parseTempMessage(pMsg))
} }
func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message) { func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
groupJoinLock.Lock() groupJoinLock.Lock()
defer groupJoinLock.Unlock() defer groupJoinLock.Unlock()
group := c.FindGroupByUin(pMsg.Head.GetFromUin()) group := c.FindGroupByUin(pMsg.Head.GetFromUin())
@ -207,16 +212,27 @@ func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message) {
} }
} }
func systemMessageDecoder(c *QQClient, pMsg *msg.Message) { func systemMessageDecoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
_, pkt := c.buildSystemMsgNewFriendPacket() _, pkt := c.buildSystemMsgNewFriendPacket()
_ = c.send(pkt) _ = c.send(pkt)
} }
func troopSystemMessageDecoder(c *QQClient, pMsg *msg.Message) { func troopSystemMessageDecoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
c.exceptAndDispatchGroupSysMsg() if !opt.UsedRegProxy && pMsg.Head.GetMsgType() != 85 && pMsg.Head.GetMsgType() != 36 {
c.exceptAndDispatchGroupSysMsg()
}
if len(pMsg.Body.GetMsgContent()) == 0 {
return
}
reader := binary.NewReader(pMsg.GetBody().GetMsgContent())
groupCode := uint32(reader.ReadInt32())
if info := c.FindGroup(int64(groupCode)); info != nil && pMsg.Head.GetGroupName() != "" && info.Name != pMsg.Head.GetGroupName() {
c.Debug("group %v name updated. %v -> %v", groupCode, info.Name, pMsg.Head.GetGroupName())
info.Name = pMsg.Head.GetGroupName()
}
} }
func msgType0x211Decoder(c *QQClient, pMsg *msg.Message) { func msgType0x211Decoder(c *QQClient, pMsg *msg.Message, opt *c2cExtraOption) {
sub4 := msg.SubMsgType0X4Body{} sub4 := msg.SubMsgType0X4Body{}
if err := proto.Unmarshal(pMsg.Body.MsgContent, &sub4); err != nil { if err := proto.Unmarshal(pMsg.Body.MsgContent, &sub4); err != nil {
err = errors.Wrap(err, "unmarshal sub msg 0x4 error") err = errors.Wrap(err, "unmarshal sub msg 0x4 error")

2
client/decoders.go
View File

@ -294,7 +294,7 @@ func decodeMessageSvcPacket(c *QQClient, _ uint16, payload []byte) (interface{},
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to unmarshal protobuf message") return nil, errors.Wrap(err, "failed to unmarshal protobuf message")
} }
c.c2cMessageSyncProcessor(&rsp) c.c2cMessageSyncProcessor(&rsp, &c2cExtraOption{UsedRegProxy: false})
return nil, nil return nil, nil
} }

2
client/sync.go
View File

@ -376,7 +376,7 @@ func decodeMsgSyncResponse(c *QQClient, _ uint16, payload []byte) (interface{},
if len(rsp.C2CMsg) > 4 { if len(rsp.C2CMsg) > 4 {
c2cRsp := &msg.GetMessageResponse{} c2cRsp := &msg.GetMessageResponse{}
if proto.Unmarshal(rsp.C2CMsg[4:], c2cRsp) == nil { if proto.Unmarshal(rsp.C2CMsg[4:], c2cRsp) == nil {
c.c2cMessageSyncProcessor(c2cRsp) // todo rewrite c2c processor c.c2cMessageSyncProcessor(c2cRsp, &c2cExtraOption{UsedRegProxy: true})
} }
} }
return ret, nil return ret, nil