fix: FutureEvent

plugin/manager/manager.go

@@ -417,13 +417,13 @@ func init() { // 插件主体
 							}
 							return false
 						}
-						next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID), rule)
+						next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), rule)
 						recv, cancel := next.Repeat()
 						select {
 						case <-time.After(time.Minute):
+							cancel()
 							ctx.SendChain(message.Text("拜拜啦~"))
 							ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
-							cancel()
 						case <-recv:
 							cancel()
 							ctx.SendChain(message.Text("答对啦~"))

plugin/scale/main.go

@@ -111,7 +111,7 @@ func init() {
 }
 
 func getPara(ctx *zero.Ctx) bool {
-	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
 	recv, cancel := next.Repeat()
 	i := 0
 	paras := [2]int{}
@@ -119,9 +119,10 @@ func getPara(ctx *zero.Ctx) bool {
 	for {
 		select {
 		case <-time.After(time.Second * 120):
+			cancel()
 			return false
-		case e := <-recv:
-			msg := e.Message.ExtractPlainText()
+		case c := <-recv:
+			msg := c.Event.Message.ExtractPlainText()
 			num, err := strconv.Atoi(msg)
 			if err != nil {
 				ctx.SendChain(message.Text("请输入数字!"))

plugin/vtb_quotation/vtb_quotation.go

@@ -78,25 +78,25 @@ func init() {
 			errorCount := 0
 			for {
 				select {
-				case e := <-echo: // 接收到需要复读的消息
+				case c := <-echo: // 接收到需要复读的消息
 					// 错误次数达到3次，结束命令
 					if errorCount >= 3 {
-						ctx.SendChain(message.Reply(e.MessageID), message.Text("输入错误太多,请重新发指令"))
+						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("输入错误太多,请重新发指令"))
 						return
 					}
 					switch step {
 					case 0:
-						firstIndex, err = strconv.Atoi(e.RawMessage)
+						firstIndex, err = strconv.Atoi(c.Event.RawMessage)
 						// log.Println(fmt.Sprintf("当前在第%d步", step))
 						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							secondStepMessage := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
 							// log.Println(secondStepMessage)
 							if secondStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
 								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
@@ -117,17 +117,17 @@ func init() {
 							}
 						}
 					case 1:
-						secondIndex, err = strconv.Atoi(e.RawMessage)
+						secondIndex, err = strconv.Atoi(c.Event.RawMessage)
 						// log.Println(fmt.Sprintf("当前在第%d步", step))
 						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							thirdStepMessage := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
 							// log.Println(thirdStepMessage)
 							if thirdStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
 								secondStepMessageBytes, err := text.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
@@ -148,18 +148,18 @@ func init() {
 							}
 						}
 					case 2:
-						thirdIndex, err = strconv.Atoi(e.RawMessage)
+						thirdIndex, err = strconv.Atoi(c.Event.RawMessage)
 						// log.Println(fmt.Sprintf("当前在第%d步", step))
 						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							tc := db.GetThirdCategory(firstIndex, secondIndex, thirdIndex)
 							reg := regexp.MustCompile(regStr)
 							recURL := tc.ThirdCategoryPath
 							if recURL == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
 								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
@@ -177,7 +177,7 @@ func init() {
 									recURL = strings.ReplaceAll(recURL, "+", "%20")
 									// log.Println(recordUrl)
 								}
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
 
 								if !re.MatchString(recURL) {
 									log.Errorln("[vtb]:文件格式不匹配")

plugin/wordle/wordle.go

@@ -108,7 +108,7 @@ func init() {
 			var next *zero.FutureEvent
 			if ctx.State["regex_matched"].([]string)[1] == "个人" {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
-					zero.OnlyGroup, zero.CheckUser(ctx.Event.UserID))
+					zero.OnlyGroup, ctx.CheckSession())
 			} else {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
 					zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
@@ -126,12 +126,12 @@ func init() {
 						),
 					)
 					return
-				case e := <-recv:
-					win, img, cl, err = game(e.Message.String())
+				case c := <-recv:
+					win, img, cl, err = game(c.Event.Message.String())
 					switch {
 					case win:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 								message.Text("太棒了，你猜出来了！"),
 							),
@@ -140,7 +140,7 @@ func init() {
 						return
 					case err == errTimesRunOut:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 								message.Text("游戏结束...答案是: ", target),
 							),
@@ -149,19 +149,19 @@ func init() {
 						return
 					case err == errLengthNotEnough:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("单词长度错误"),
 							),
 						)
 					case err == errUnknownWord:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("你确定存在这样的单词吗？"),
 							),
 						)
 					default:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 							),
 						)