Make lint happy and try resolving conflict

sealdice · Oct 19, 2024 · b17d400 · b17d400
1 parent d8a535a
commit b17d400
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dice/ext_log.go b/dice/ext_log.go
@@ -181,7 +181,7 @@ func RegisterBuiltinExtLog(self *Dice) {
 				ReplyToSenderRaw(ctx, msg, successPrompt, "skip")
 			}
 
-			if args.IsArgEqual(1, "on") {
+			if args.IsArgEqual(1, "on") { //nolint:nestif
 				if !checkGroupEnviron(true) {
 					return CmdExecuteResult{Matched: true, Solved: true}
 				}
@@ -260,7 +260,7 @@ func RegisterBuiltinExtLog(self *Dice) {
 					return CmdExecuteResult{Matched: true, Solved: true}
 				}
 
-				collectLogAndUpload(groupID, logName)
+				go collectLogAndUpload(groupID, logName)
 			} else if args.IsArgEqual(1, "end") {
 				if currentGroup.LogCurName == "" {
 					ReplyToSender(ctx, msg, DiceFormatTmpl(ctx, "日志:记录_关闭_失败"))
@@ -276,7 +276,7 @@ func RegisterBuiltinExtLog(self *Dice) {
 				currentGroup.UpdatedAtTime = time.Now().Unix()
 
 				time.Sleep(time.Duration(0.3 * float64(time.Second)))
-				collectLogAndUpload(currentGroup.GroupID, currentGroup.LogCurName)
+				go collectLogAndUpload(currentGroup.GroupID, currentGroup.LogCurName)
 
 				currentGroup.LogCurName = ""
 				currentGroup.UpdatedAtTime = time.Now().Unix()