diff --git a/event.go b/event.go index e7d1997..d321177 100644 --- a/event.go +++ b/event.go @@ -219,7 +219,7 @@ loop: if m.Engine != nil { for _, handler := range m.Engine.preHandler { if !handler(ctx) { // 有 pre handler 未满足 - if m.Block { // 阻断后续 + if m.Break { // 阻断后续 break loop } continue loop @@ -229,7 +229,7 @@ loop: for _, rule := range m.Rules { if rule != nil && !rule(ctx) { // 有 Rule 的条件未满足 - if m.Block { // 阻断后续 + if m.Break { // 阻断后续 break loop } continue loop @@ -240,7 +240,7 @@ loop: if m.Engine != nil { for _, handler := range m.Engine.midHandler { if !handler(ctx) { // 有 mid handler 未满足 - if m.Block { // 阻断后续 + if m.Break { // 阻断后续 break loop } continue loop diff --git a/go.mod b/go.mod index 7d1b6da..1ec7369 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,14 @@ module github.com/fumiama/ReiBot go 1.18 require ( - github.com/FloatTech/floatbox v0.0.0-20221010154018-16998fe73c7b - github.com/FloatTech/zbpctrl v1.5.2-0.20221010161826-e1908f4328ba + github.com/FloatTech/floatbox v0.0.0-20221011153549-68005767c531 + github.com/FloatTech/zbpctrl v1.5.2-0.20221011153929-4834c6911511 github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c github.com/fumiama/go-base16384 v1.5.4 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.0 - github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221010153647-ef3e42aff1ff + github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221011153413-16c9a77ce4f0 ) require ( diff --git a/go.sum b/go.sum index 608bc84..9e5476c 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ -github.com/FloatTech/floatbox v0.0.0-20221010154018-16998fe73c7b h1:UOREhlQ4DRaFItwTnj5JUHYfOZqcwz0QjzAU0R2OWCo= -github.com/FloatTech/floatbox v0.0.0-20221010154018-16998fe73c7b/go.mod h1:QOOZGdU9EhrunQv9qiYB4tyR5450QW2HjlkoVWAlzJ8= +github.com/FloatTech/floatbox v0.0.0-20221011153549-68005767c531 h1:Z0yn6LFhEyC12hj+TBXc2P7/kWlCd/jlwv4JFndgpnw= +github.com/FloatTech/floatbox v0.0.0-20221011153549-68005767c531/go.mod h1:4tfIeB74L1RzhNp3nNjaTw8m3IEnc+q/k6k/MhL07ks= github.com/FloatTech/sqlite v0.5.0 h1:U7J5Omc534PqmH6csfu+ypCo3DS8L91l5lTsxUu3b/U= github.com/FloatTech/sqlite v0.5.0/go.mod h1:i33d92OtR8jcp5fBUvQtospf27+MkfUxnGwnZ95E/dA= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw= github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs= -github.com/FloatTech/zbpctrl v1.5.2-0.20221010161826-e1908f4328ba h1:/jJ6hHudMzSvky2oyoti9ZiUFPiyN65FkIXn4LxvYw8= -github.com/FloatTech/zbpctrl v1.5.2-0.20221010161826-e1908f4328ba/go.mod h1:C7zee0O6bPtkDVh9NDGl77bVECOs/PL23x36/QEl4lE= +github.com/FloatTech/zbpctrl v1.5.2-0.20221011153929-4834c6911511 h1:i2+JjTRR7gW8n1KivMKj3NEsCEEllYp8jneeOyg1Lz0= +github.com/FloatTech/zbpctrl v1.5.2-0.20221011153929-4834c6911511/go.mod h1:TC5RkmSwKJvkDV+7vlTpcY+rnviB5gBq6JNOKnfZXHc= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -46,8 +46,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= -github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221010153647-ef3e42aff1ff h1:CCLcXk7ZlT26MQ8Ad7RreGTd4XPwmtiA6Qe4J+saZSI= -github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221010153647-ef3e42aff1ff/go.mod h1:shG/ruauisKaVcov4amrFJtkeDl7nl+Q00IXB2PqFsc= +github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221011153413-16c9a77ce4f0 h1:IKWX0c7b3URoFDt5ezD6wa0AZIQ0EY0GbPVhYfuzXug= +github.com/wdvxdr1123/ZeroBot v1.5.2-0.20221011153413-16c9a77ce4f0/go.mod h1:shG/ruauisKaVcov4amrFJtkeDl7nl+Q00IXB2PqFsc= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=