Beta491 (#495)

* beta447 * beta448 * beta449 * beta450 * beta451 * beta452 * beta453 * beta454 * beta455 * btea455 * beta456 * beta457 * beta458 * beta460 * beta460 * beta461 * beta462 * beta463 * beta464 * beta465 * beta467 * beta468 * beta469 * beta470 * beta471 * beta472 * beta473 * beta473 * beta475 * beta476 * beta478 * beta479 * beta479 * beta480 * beta481 * beta482 * beta483 * beta484 * beta485 * beta486 * beta486 * beta487 * beta487 * beta489 * beta490 * beta491
Hoshinonyaruko · Aug 22, 2024 · 107b096 · 107b096
1 parent 42f3f33
commit 107b096
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/echo/messageidmap.go b/echo/messageidmap.go
@@ -58,7 +58,7 @@ func GetLazyMessagesId(groupID string) string {
 	store.mu.RLock()
 	defer store.mu.RUnlock()
 
-	fiveMinutesAgo := time.Now().Add(-5 * time.Minute)
+	fiveMinutesAgo := time.Now().Add(-4 * time.Minute)
 	var recentMessages []string
 	for _, record := range store.records[groupID] {
 		if record.timestamp.After(fiveMinutesAgo) {
@@ -94,7 +94,7 @@ func GetLazyMessagesIdv2(groupID, userID string) string { //1
 	// 构建复合键
 	key := groupID + "." + userID
 
-	fiveMinutesAgo := time.Now().Add(-5 * time.Minute)
+	fiveMinutesAgo := time.Now().Add(-4 * time.Minute)
 	var recentMessages []string
 	for _, record := range store.records[key] {
 		if record.timestamp.After(fiveMinutesAgo) {

diff --git a/handlers/send_group_msg.go b/handlers/send_group_msg.go
@@ -111,21 +111,24 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
 	}
 
 	if message.Params.GroupID != nil && len(message.Params.GroupID.(string)) != 32 {
-		//设置递归 对直接向gsk发送action时有效果
-		if msgType == "" {
-			messageCopy := message
-			if err != nil {
-				mylog.Printf("错误：无法转换 ID %v\n", err)
-			} else {
-				// 递归3次
-				echo.AddMapping(idInt64, 4)
-				// 递归调用handleSendGroupMsg，使用设置的消息类型
-				echo.AddMsgType(config.GetAppIDStr(), idInt64, "group_private")
-				retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
+		// stringob11通过字段判断类型,不需要递归
+		if !config.GetStringOb11() {
+			//设置递归 对直接向gsk发送action时有效果
+			if msgType == "" {
+				messageCopy := message
+				if err != nil {
+					mylog.Printf("错误：无法转换 ID %v\n", err)
+				} else {
+					// 递归3次
+					echo.AddMapping(idInt64, 4)
+					// 递归调用handleSendGroupMsg，使用设置的消息类型
+					echo.AddMsgType(config.GetAppIDStr(), idInt64, "group_private")
+					retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
+				}
+			} else if echo.GetMapping(idInt64) <= 0 {
+				// 特殊值代表不递归
+				echo.AddMapping(idInt64, 10)
 			}
-		} else if echo.GetMapping(idInt64) <= 0 {
-			// 特殊值代表不递归
-			echo.AddMapping(idInt64, 10)
 		}
 	}
 
@@ -697,24 +700,27 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
 		mylog.Printf("Unknown message type: %s", msgType)
 	}
 
-	// 如果递归id不是10(不递归特殊值)
-	if echo.GetMapping(idInt64) != 10 {
-		//重置递归类型 递归结束重置类型,避免下一次同样id,不同类型的请求被使用上一次类型
-		if echo.GetMapping(idInt64) <= 0 {
-			echo.AddMsgType(config.GetAppIDStr(), idInt64, "")
-		}
-
-		//减少递归计数器
-		echo.AddMapping(idInt64, echo.GetMapping(idInt64)-1)
-
-		//递归3次枚举类型
-		if echo.GetMapping(idInt64) > 0 {
-			tryMessageTypes := []string{"group", "guild", "guild_private"}
-			messageCopy := message // 创建message的副本
-			echo.AddMsgType(config.GetAppIDStr(), idInt64, tryMessageTypes[echo.GetMapping(idInt64)-1])
-			delay := config.GetSendDelay()
-			time.Sleep(time.Duration(delay) * time.Millisecond)
-			retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
+	// stringob11不需要递归
+	if !config.GetStringOb11() {
+		// 如果递归id不是10(不递归特殊值)
+		if echo.GetMapping(idInt64) != 10 {
+			//重置递归类型 递归结束重置类型,避免下一次同样id,不同类型的请求被使用上一次类型
+			if echo.GetMapping(idInt64) <= 0 {
+				echo.AddMsgType(config.GetAppIDStr(), idInt64, "")
+			}
+
+			//减少递归计数器
+			echo.AddMapping(idInt64, echo.GetMapping(idInt64)-1)
+
+			//递归3次枚举类型
+			if echo.GetMapping(idInt64) > 0 {
+				tryMessageTypes := []string{"group", "guild", "guild_private"}
+				messageCopy := message // 创建message的副本
+				echo.AddMsgType(config.GetAppIDStr(), idInt64, tryMessageTypes[echo.GetMapping(idInt64)-1])
+				delay := config.GetSendDelay()
+				time.Sleep(time.Duration(delay) * time.Millisecond)
+				retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
+			}
 		}
 	}
 

diff --git a/mylog/errlog.go b/mylog/errlog.go
@@ -10,9 +10,6 @@ import (
 
 // 独立的错误日志记录函数
 func ErrLogToFile(level, message string) {
-	if !enableFileLogGlobal {
-		return
-	}
 	filename := time.Now().Format("2006-01-02") + "-error.log"
 	filepath := logPath + "/" + filename
 
@@ -31,9 +28,6 @@ func ErrLogToFile(level, message string) {
 
 // 独立的错误日志记录函数
 func ErrInterfaceToFile(level, message interface{}) {
-	if !enableFileLogGlobal {
-		return
-	}
 	filename := time.Now().Format("2006-01-02") + "-error.log"
 	filepath := logPath + "/" + filename