From 733ef7c8b82f61ac640f686a54c09c435dd602b5 Mon Sep 17 00:00:00 2001
From: poiuty <poiuty@protonmail.com>
Date: Wed, 24 May 2023 01:05:53 +0300
Subject: [PATCH] Update worker.go

---
 app/worker.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/worker.go b/app/worker.go
index 5984e08..dd7e95c 100644
--- a/app/worker.go
+++ b/app/worker.go
@@ -195,7 +195,7 @@ func xWorker(workerData Info, u url.URL) {
 		_, message, err := c.ReadMessage()
 		if err != nil {
 			fmt.Println(err.Error(), workerData.room)
-			if income > 1 && websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway) {
+			if income > 1 && !isLeave && websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway) {
 				go reconnectRoom(workerData)
 			}
 			return
@@ -208,8 +208,8 @@ func xWorker(workerData Info, u url.URL) {
 
 		//fmt.Println(m)
 
-		if now > workerData.Last+60*20 {
-			fmt.Println("no_mes exit:", workerData.room)
+		if now > workerData.Last+60*60 {
+			fmt.Println("no_tips exit:", workerData.room)
 			return
 		}
 
@@ -220,9 +220,6 @@ func xWorker(workerData Info, u url.URL) {
 
 		if input.Action == 15 {
 
-			workerData.Last = now
-			rooms.Add <- workerData
-
 			if input.Channel == "room:enter_leave:"+workerData.Id {
 				type Message struct {
 					Data string `json:"data"`
@@ -310,6 +307,7 @@ func xWorker(workerData Info, u url.URL) {
 					}
 
 					save <- saveData{Room: workerData.room, From: donate.From, Rid: workerData.Rid, Amount: donate.Amount, Now: now}
+					workerData.Last = now
 					workerData.Income += donate.Amount
 					rooms.Add <- workerData