Skip to content

Commit 25ab8c9

Browse files
fumiamafumiama
committed
fix: FutureEvent
1 parent 82768ff commit 25ab8c9

File tree

6 files changed

+48
-46
lines changed

6 files changed

+48
-46
lines changed

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
33
go 1.18
44

55
require (
6-
github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b
6+
github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da
77
github.com/FloatTech/sqlite v0.2.1
8-
github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29
8+
github.com/FloatTech/zbputils v1.3.2-0.20220326161600-f9554b2fb9a4
99
github.com/antchfx/htmlquery v1.2.4
1010
github.com/corona10/goimagehash v1.0.3
1111
github.com/fogleman/gg v1.3.0
@@ -22,8 +22,8 @@ require (
2222
github.com/shirou/gopsutil/v3 v3.22.2
2323
github.com/sirupsen/logrus v1.8.1
2424
github.com/tidwall/gjson v1.14.0
25-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217
26-
golang.org/x/image v0.0.0-20220302094943-723b81ca9867
25+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785
26+
golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
2727
)
2828

2929
require (
@@ -47,9 +47,9 @@ require (
4747
github.com/tklauser/numcpus v0.4.0 // indirect
4848
github.com/yusufpapurcu/wmi v1.2.2 // indirect
4949
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
50-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
50+
golang.org/x/sys v0.0.0-20220325203850-36772127a21f // indirect
5151
golang.org/x/text v0.3.7 // indirect
52-
modernc.org/libc v1.14.11 // indirect
52+
modernc.org/libc v1.14.12 // indirect
5353
modernc.org/mathutil v1.4.1 // indirect
54-
modernc.org/memory v1.0.6 // indirect
54+
modernc.org/memory v1.0.7 // indirect
5555
)

‎go.sum

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b h1:lgYo6Q8s9yf/mkb2AeXS2d6mVrzNSLrDKf/FeNM5oxg=
2-
github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b/go.mod h1:VgjXeR2M2wxs43Rmh9/3ybn+gAtzSFRwBmb/rXFEwsM=
1+
github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da h1:KbJujP8k2/3BYRb+F292zLmDOV79uTOu/24n3fhIwRU=
2+
github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da/go.mod h1:aC3EOKpb0R0VOdW9QIQCfqN6ZFymOfvCgzVY1/Fz3Og=
33
github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
44
github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
5-
github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29 h1:+Sk3cj+1xckSJJ/woLAjOzWKu9YpBRGNTUjcT6W7nLQ=
6-
github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29/go.mod h1:Z4pVG8bHlDgVuPjgPvMyylPOBrroFq6x3a5QSVK1V08=
5+
github.com/FloatTech/zbputils v1.3.2-0.20220326161600-f9554b2fb9a4 h1:+OnHN8QcMqwEx37a3TMBw7CT5OTyFs8qqa4Hub+Igbk=
6+
github.com/FloatTech/zbputils v1.3.2-0.20220326161600-f9554b2fb9a4/go.mod h1:qZlHzG1s1giQrXaosjOAA2utGNaPZjwJsVZfBog2bhg=
77
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
88
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
99
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
@@ -122,8 +122,8 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
122122
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
123123
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
124124
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
125-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217 h1:mJPi1JVivQ3F9fDZUiGE8pW9ShNct01C8yqBPcbcepI=
126-
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
125+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785 h1:alVsiLOu9H0GCriAkTMqn310izMNEzg9y1Z9FqAV1DY=
126+
github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
127127
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
128128
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
129129
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -132,10 +132,10 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
132132
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
133133
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
134134
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
135-
golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
135+
golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s=
136136
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
137-
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
138-
golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
137+
golang.org/x/image v0.0.0-20220321031419-a8550c1d254a h1:LnH9RNcpPv5Kzi15lXg42lYMPUf0x8CuPv1YnvBWZAg=
138+
golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
139139
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
140140
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
141141
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -168,8 +168,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
168168
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
169169
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
170170
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
171-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
172-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
171+
golang.org/x/sys v0.0.0-20220325203850-36772127a21f h1:TrmogKRsSOxRMJbLYGrB4SBbW+LJcEllYBLME5Zk5pU=
172+
golang.org/x/sys v0.0.0-20220325203850-36772127a21f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
173173
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
174174
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
175175
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -301,17 +301,18 @@ modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
301301
modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
302302
modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
303303
modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
304-
modernc.org/libc v1.14.11 h1:ivxNmUkfp5iSGAGMIjylvx5R53s6QTJW9qUru1yrnk4=
305-
modernc.org/libc v1.14.11/go.mod h1:l5/Mz/GrZwOqzwRHA3abgSCnSeJzzTl+Ify0bAwKbAw=
304+
modernc.org/libc v1.14.12 h1:pUBZTYoISfbb4pCf4PECENpbvwDBxeKc+/dS9LyOWFM=
305+
modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ=
306306
modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
307307
modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
308308
modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
309309
modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
310310
modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
311311
modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
312312
modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
313-
modernc.org/memory v1.0.6 h1:5IaT/LChMrMdxLCy/a4qmb+7SzGiU8/ozPgkEOrfvFw=
314313
modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
314+
modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE=
315+
modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
315316
modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
316317
modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
317318
modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

‎plugin/manager/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,13 @@ func init() { // 插件主体
417417
}
418418
return false
419419
}
420-
next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID), rule)
420+
next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), rule)
421421
recv, cancel := next.Repeat()
422422
select {
423423
case <-time.After(time.Minute):
424+
cancel()
424425
ctx.SendChain(message.Text("拜拜啦~"))
425426
ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
426-
cancel()
427427
case <-recv:
428428
cancel()
429429
ctx.SendChain(message.Text("答对啦~"))

‎plugin/scale/main.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,18 @@ func init() {
111111
}
112112

113113
func getPara(ctx *zero.Ctx) bool {
114-
next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
114+
next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
115115
recv, cancel := next.Repeat()
116116
i := 0
117117
paras := [2]int{}
118118
ctx.SendChain(message.Text("请输入模型序号\n0.", scale.Models[0], "\n1.", scale.Models[1], "\n2.", scale.Models[2], "\n3.", scale.Models[3], "\n4.", scale.Models[4]))
119119
for {
120120
select {
121121
case <-time.After(time.Second * 120):
122+
cancel()
122123
return false
123-
case e := <-recv:
124-
msg := e.Message.ExtractPlainText()
124+
case c := <-recv:
125+
msg := c.Event.Message.ExtractPlainText()
125126
num, err := strconv.Atoi(msg)
126127
if err != nil {
127128
ctx.SendChain(message.Text("请输入数字!"))

‎plugin/vtb_quotation/vtb_quotation.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,25 @@ func init() {
7878
errorCount := 0
7979
for {
8080
select {
81-
case e := <-echo: // 接收到需要复读的消息
81+
case c := <-echo: // 接收到需要复读的消息
8282
// 错误次数达到3次，结束命令
8383
if errorCount >= 3 {
84-
ctx.SendChain(message.Reply(e.MessageID), message.Text("输入错误太多,请重新发指令"))
84+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("输入错误太多,请重新发指令"))
8585
return
8686
}
8787
switch step {
8888
case 0:
89-
firstIndex, err = strconv.Atoi(e.RawMessage)
89+
firstIndex, err = strconv.Atoi(c.Event.RawMessage)
9090
// log.Println(fmt.Sprintf("当前在第%d步", step))
9191
// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
9292
if err != nil {
93-
ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
93+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
9494
errorCount++
9595
} else {
9696
secondStepMessage := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
9797
// log.Println(secondStepMessage)
9898
if secondStepMessage == "" {
99-
ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
99+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
100100
firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
101101
if err != nil {
102102
log.Errorln("[vtb]:", err)
@@ -117,17 +117,17 @@ func init() {
117117
}
118118
}
119119
case 1:
120-
secondIndex, err = strconv.Atoi(e.RawMessage)
120+
secondIndex, err = strconv.Atoi(c.Event.RawMessage)
121121
// log.Println(fmt.Sprintf("当前在第%d步", step))
122122
// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
123123
if err != nil {
124-
ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
124+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
125125
errorCount++
126126
} else {
127127
thirdStepMessage := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
128128
// log.Println(thirdStepMessage)
129129
if thirdStepMessage == "" {
130-
ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
130+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
131131
secondStepMessageBytes, err := text.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), text.FontFile, 400, 20)
132132
if err != nil {
133133
log.Errorln("[vtb]:", err)
@@ -148,18 +148,18 @@ func init() {
148148
}
149149
}
150150
case 2:
151-
thirdIndex, err = strconv.Atoi(e.RawMessage)
151+
thirdIndex, err = strconv.Atoi(c.Event.RawMessage)
152152
// log.Println(fmt.Sprintf("当前在第%d步", step))
153153
// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
154154
if err != nil {
155-
ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
155+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
156156
errorCount++
157157
} else {
158158
tc := db.GetThirdCategory(firstIndex, secondIndex, thirdIndex)
159159
reg := regexp.MustCompile(regStr)
160160
recURL := tc.ThirdCategoryPath
161161
if recURL == "" {
162-
ctx.SendChain(message.Reply(e.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
162+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
163163
firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
164164
if err != nil {
165165
log.Errorln("[vtb]:", err)
@@ -177,7 +177,7 @@ func init() {
177177
recURL = strings.ReplaceAll(recURL, "+", "%20")
178178
// log.Println(recordUrl)
179179
}
180-
ctx.SendChain(message.Reply(e.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
180+
ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
181181

182182
if !re.MatchString(recURL) {
183183
log.Errorln("[vtb]:文件格式不匹配")

‎plugin/wordle/wordle.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func init() {
108108
var next *zero.FutureEvent
109109
if ctx.State["regex_matched"].([]string)[1] == "个人" {
110110
next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
111-
zero.OnlyGroup, zero.CheckUser(ctx.Event.UserID))
111+
zero.OnlyGroup, ctx.CheckSession())
112112
} else {
113113
next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
114114
zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
@@ -126,12 +126,12 @@ func init() {
126126
),
127127
)
128128
return
129-
case e := <-recv:
130-
win, img, cl, err = game(e.Message.String())
129+
case c := <-recv:
130+
win, img, cl, err = game(c.Event.Message.String())
131131
switch {
132132
case win:
133133
ctx.Send(
134-
message.ReplyWithMessage(e.MessageID,
134+
message.ReplyWithMessage(c.Event.MessageID,
135135
message.ImageBytes(img),
136136
message.Text("太棒了，你猜出来了！"),
137137
),
@@ -140,7 +140,7 @@ func init() {
140140
return
141141
case err == errTimesRunOut:
142142
ctx.Send(
143-
message.ReplyWithMessage(e.MessageID,
143+
message.ReplyWithMessage(c.Event.MessageID,
144144
message.ImageBytes(img),
145145
message.Text("游戏结束...答案是: ", target),
146146
),
@@ -149,19 +149,19 @@ func init() {
149149
return
150150
case err == errLengthNotEnough:
151151
ctx.Send(
152-
message.ReplyWithMessage(e.MessageID,
152+
message.ReplyWithMessage(c.Event.MessageID,
153153
message.Text("单词长度错误"),
154154
),
155155
)
156156
case err == errUnknownWord:
157157
ctx.Send(
158-
message.ReplyWithMessage(e.MessageID,
158+
message.ReplyWithMessage(c.Event.MessageID,
159159
message.Text("你确定存在这样的单词吗？"),
160160
),
161161
)
162162
default:
163163
ctx.Send(
164-
message.ReplyWithMessage(e.MessageID,
164+
message.ReplyWithMessage(c.Event.MessageID,
165165
message.ImageBytes(img),
166166
),
167167
)

0 commit comments

Comments
 (0)