fiee/fonchain-fiee
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 覆盖聊天相关代码

Browse Source
This commit is contained in:
徐俊杰 2025-06-19 13:23:56 +08:00
parent 0e99dc7a0b
commit 9bb4bec9f8
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/common/ws/chatRoom.go
View File

@ -194,8 +194,8 @@ func (o *ChatRoom) Register(c *Client) (sessionId string) {
// message: 消息内容 // message: 消息内容
func (o *ChatRoom) SendSessionMessage(sender *accountFiee.ChatUserData, sessionId string, msgType WsType, message any) (userIdInSession []int64, err error) { func (o *ChatRoom) SendSessionMessage(sender *accountFiee.ChatUserData, sessionId string, msgType WsType, message any) (userIdInSession []int64, err error) {
fmt.Println("ChatRoom.SendSessionMessage ------------------1") fmt.Println("ChatRoom.SendSessionMessage ------------------1")
//o.clientsRwLocker.Lock() o.clientsRwLocker.Lock()
//defer o.clientsRwLocker.Unlock() defer o.clientsRwLocker.Unlock()
var msg = WsSessionInfo{ var msg = WsSessionInfo{
Type: msgType, Type: msgType,
Content: message, Content: message,

2
pkg/service/asChat/chatAutoReplyRulerHandler.go
View File

@ -70,9 +70,7 @@ func (a *ChatAutoReplyRulerHandler) UpdateChatAutoReplyRuler(c *gin.Context) {
service.Error(c, err) service.Error(c, err)
return return
} }
fmt.Printf("response 1 : %s\n", req.Response)
protoReq := req.ToProtoData() protoReq := req.ToProtoData()
fmt.Printf("response 2 : %s\n", protoReq.Response)
_, err := service.AccountFieeProvider.UpdateChatAutoReplyRuler(c, protoReq) _, err := service.AccountFieeProvider.UpdateChatAutoReplyRuler(c, protoReq)
if err != nil { if err != nil {
service.Error(c, err) service.Error(c, err)

5
pkg/service/asChat/handler.go
View File

@ -135,6 +135,9 @@ func (cr ChatHandler) NewMessage(c *gin.Context) {
service.ErrWithCode(c, code) service.ErrWithCode(c, code)
return return
} }
if request.LocalStamp == 0 {
request.LocalStamp = time.Now().Unix()
}
err := logic.NewMessage(c, &cr.cache, chatUser, request) err := logic.NewMessage(c, &cr.cache, chatUser, request)
if err != nil { if err != nil {
service.Error(c, err) service.Error(c, err)
@ -333,7 +336,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
return messages[i].ID > messages[j].ID return messages[i].ID > messages[j].ID
} }
}) })
//fmt.Printf("data is %+v\n", messages) fmt.Printf("data is %+v\n", messages)
total := 0 total := 0
for i, message := range messages { for i, message := range messages {
switch request.Direction { switch request.Direction {

2
pkg/service/asChat/logic/chat.go
View File

@ -40,7 +40,7 @@ func NewMessage(ctx context.Context, cache *chatCache.ChatCache, sender *account
cacheMap[request.AtUserId] = request cacheMap[request.AtUserId] = request
} else { } else {
fmt.Println(request.LocalStamp - msgRecord.LocalStamp) fmt.Println(request.LocalStamp - msgRecord.LocalStamp)
if msgRecord.Message.Text == request.Message.Text && request.LocalStamp-msgRecord.LocalStamp < 20 { if msgRecord.Message.Text == request.Message.Text && request.LocalStamp-msgRecord.LocalStamp < 10 {
cacheMap[request.AtUserId] = request cacheMap[request.AtUserId] = request
return nil return nil
} else { } else {

6
pkg/service/asChat/robot/ruler_keywords.go
View File

@ -27,12 +27,6 @@ func NewReplyWhenHitKeywords(title string, keywords []string) IRobotTask {
return &RobotTaskWithKeyworkds{title: title, keywords: keywords} return &RobotTaskWithKeyworkds{title: title, keywords: keywords}
} }
func (r *RobotTaskWithKeyworkds) Hit(event ws.ListenEventData, sender *accountFiee.ChatUserData) (hit bool) { func (r *RobotTaskWithKeyworkds) Hit(event ws.ListenEventData, sender *accountFiee.ChatUserData) (hit bool) {
fmt.Printf("event.EventType != ws.EventChatMessage:%v\n", event.EventType != ws.EventChatMessage)
fmt.Printf("event.Msg == \"\":%v\n", event.Msg == "")
fmt.Printf("event.Client == nil:%v\n", event.Client == nil)
fmt.Printf("event.ChatUser == nil :%v\n", event.ChatUser == nil)
fmt.Printf("event.ChatUser.Role :%v\n", event.ChatUser.Role)
fmt.Printf("r.keywords :%v\n", r.keywords)
if event.EventType != ws.EventChatMessage || event.Msg == "" || event.Client == nil || event.ChatUser == nil { if event.EventType != ws.EventChatMessage || event.Msg == "" || event.Client == nil || event.ChatUser == nil {
return return
} }