fix: send message to self error

Mrs4s · Feb 24, 2022 · df63c99 · df63c99
1 parent c515024
commit df63c99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/client/client.go b/client/client.go
@@ -609,6 +609,12 @@ func (c *QQClient) GetMemberInfo(groupCode, memberUin int64) (*GroupMemberInfo,
 }
 
 func (c *QQClient) FindFriend(uin int64) *FriendInfo {
+	if uin == c.Uin {
+		return &FriendInfo{
+			Uin:      uin,
+			Nickname: c.Nickname,
+		}
+	}
 	for _, t := range c.FriendList {
 		f := t
 		if f.Uin == uin {

diff --git a/client/private_msg.go b/client/private_msg.go
@@ -29,7 +29,7 @@ func (c *QQClient) SendPrivateMessage(target int64, m *message.SendingMessage) *
 	if msgLen > message.MaxMessageSize || imgCount > 50 {
 		return nil
 	}
-	if frag && (msgLen > 300 || imgCount > 2) {
+	if frag && (msgLen > 300 || imgCount > 2) && target == c.Uin {
 		div := int32(rand.Uint32())
 		fragmented := m.ToFragmented()
 		for i, elems := range fragmented {
@@ -42,8 +42,10 @@ func (c *QQClient) SendPrivateMessage(target int64, m *message.SendingMessage) *
 		}
 	} else {
 		seq = c.nextFriendSeq()
-		_, pkt := c.buildFriendSendingPacket(target, seq, mr, 1, 0, 0, t, m.Elements)
-		_ = c.sendPacket(pkt)
+		if target != c.Uin {
+			_, pkt := c.buildFriendSendingPacket(target, seq, mr, 1, 0, 0, t, m.Elements)
+			_ = c.sendPacket(pkt)
+		}
 	}
 	c.stat.MessageSent.Add(1)
 	ret := &message.PrivateMessage{