refactor: kicknt作为disconnect事件

LagrangeDev · Nov 15, 2024 · e34ed53 · e34ed53
1 parent 2d6282c
commit e34ed53
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/client/base.go b/client/base.go
@@ -99,8 +99,6 @@ type QQClient struct {
 	cache cache.Cache
 
 	// event handles
-	KickedEvent EventHandle[*event.Kicked]
-
 	GroupMessageEvent   EventHandle[*message.GroupMessage]
 	PrivateMessageEvent EventHandle[*message.PrivateMessage]
 	TempMessageEvent    EventHandle[*message.TempMessage]

diff --git a/client/event/sys.go b/client/event/sys.go
diff --git a/client/listener.go b/client/listener.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"errors"
+	"fmt"
 	"runtime/debug"
 
 	"github.com/LagrangeDev/LagrangeGo/client/packets/pb/system"
@@ -352,7 +353,8 @@ func decodeKickNTPacket(c *QQClient, pkt *network.Packet) (any, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.KickedEvent.dispatch(c, eventConverter.ParseKickedEvent(&pb))
+	c.Disconnect()
+	go c.DisconnectedEvent.dispatch(c, &DisconnectedEvent{Message: fmt.Sprintf("%s:%s", pb.Title, pb.Tips)})
 	return nil, nil
 }
 

diff --git a/client/network.go b/client/network.go
@@ -303,7 +303,7 @@ func (c *QQClient) netLoop() {
 		// pkt, err := packets.ParseIncomingPacket(data, c.sig.D2Key)
 		if err != nil {
 			c.error("parse incoming packet error: %v", err)
-			if errors.Is(err, network.ErrSessionExpired) || errors.Is(err, network.ErrPacketDropped) {
+			if errors.Is(err, network.ErrSessionExpired) || errors.Is(err, network.ErrAuthenticationFailed) || errors.Is(err, network.ErrPacketDropped) {
 				c.Disconnect()
 				go c.DisconnectedEvent.dispatch(c, &DisconnectedEvent{Message: err.Error()})
 				continue