🐛 fix: 摸鱼日历&插件控制

This commit is contained in:
fumiama 2022-02-25 13:24:21 +08:00
parent 7aed9a2c89
commit 7cf767f344
4 changed files with 9 additions and 8 deletions

View File

@ -57,6 +57,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
- [x] /全局启用 xxx - [x] /全局启用 xxx
- [x] /全局禁用 xxx - [x] /全局禁用 xxx
- [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态) - [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态)
- 注:当全局未配置或与默认相同时,状态取决于单独配置,后备为默认配置;当全局与默认不同时,状态取决于全局配置,单独配置失效。
- [x] /禁止 service qq1 qq2... (禁止 qqs 使用服务 service) - [x] /禁止 service qq1 qq2... (禁止 qqs 使用服务 service)
- [x] /允许 service qq1 qq2... (重新允许 qqs 使用服务 service) - [x] /允许 service qq1 qq2... (重新允许 qqs 使用服务 service)
- [x] /封禁 qq1 qq2... (禁止 qqs 使用全部服务) - [x] /封禁 qq1 qq2... (禁止 qqs 使用全部服务)

2
go.mod
View File

@ -5,7 +5,7 @@ go 1.17
require ( require (
github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220224052148-f7a1379d4a00 github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220224052148-f7a1379d4a00
github.com/FloatTech/sqlite v0.2.0 github.com/FloatTech/sqlite v0.2.0
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220224132834-0341eb3c3b13 github.com/FloatTech/zbputils v1.3.0-beta8.0.20220225052222-7539b0dd28e8
github.com/antchfx/htmlquery v1.2.4 github.com/antchfx/htmlquery v1.2.4
github.com/corona10/goimagehash v1.0.3 github.com/corona10/goimagehash v1.0.3
github.com/fogleman/gg v1.3.0 github.com/fogleman/gg v1.3.0

4
go.sum
View File

@ -4,8 +4,8 @@ github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9
github.com/FloatTech/sqlite v0.2.0 h1:x3uls/hExXH1+bbaNLkvilce6ATtWlDx4IqoxBW/bv8= github.com/FloatTech/sqlite v0.2.0 h1:x3uls/hExXH1+bbaNLkvilce6ATtWlDx4IqoxBW/bv8=
github.com/FloatTech/sqlite v0.2.0/go.mod h1:xIDWIvpOFl8AXmZm0FC8t3PZjiR6ZutytCpBv2EWCns= github.com/FloatTech/sqlite v0.2.0/go.mod h1:xIDWIvpOFl8AXmZm0FC8t3PZjiR6ZutytCpBv2EWCns=
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220224051618-597cdb58b3fe/go.mod h1:Jn5LmnwqYivr64qQJBdhDwm2gRut8Hhq5gPBydV0Gvg= github.com/FloatTech/zbputils v1.3.0-beta8.0.20220224051618-597cdb58b3fe/go.mod h1:Jn5LmnwqYivr64qQJBdhDwm2gRut8Hhq5gPBydV0Gvg=
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220224132834-0341eb3c3b13 h1:EMkixYWDwQKdlUpt0MF63Nj1e5pdladkWJ++5VCTGSc= github.com/FloatTech/zbputils v1.3.0-beta8.0.20220225052222-7539b0dd28e8 h1:/sfOwdrK5Q4OuDuEpu8dDkUemIqR+TsjD9kNv3OxF7M=
github.com/FloatTech/zbputils v1.3.0-beta8.0.20220224132834-0341eb3c3b13/go.mod h1:Jn5LmnwqYivr64qQJBdhDwm2gRut8Hhq5gPBydV0Gvg= github.com/FloatTech/zbputils v1.3.0-beta8.0.20220225052222-7539b0dd28e8/go.mod h1:Jn5LmnwqYivr64qQJBdhDwm2gRut8Hhq5gPBydV0Gvg=
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0= github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0= github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=

View File

@ -6,7 +6,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"regexp" "regexp"
@ -38,7 +37,7 @@ func init() {
}) })
// 定时任务每天8点执行一次 // 定时任务每天8点执行一次
_, err := process.CronTab.AddFunc("* 8 * * *", func() { _, err := process.CronTab.AddFunc("30 8 * * *", func() {
m, ok := control.Lookup("moyucalendar") m, ok := control.Lookup("moyucalendar")
if !ok { if !ok {
return return
@ -51,7 +50,8 @@ func init() {
for _, g := range ctx.GetGroupList().Array() { for _, g := range ctx.GetGroupList().Array() {
grp := g.Get("group_id").Int() grp := g.Get("group_id").Int()
if m.IsEnabledIn(grp) { if m.IsEnabledIn(grp) {
ctx.SendGroupMessage(grp, []message.MessageSegment{message.Image(image)}) ctx.SendGroupMessage(grp, message.Message{message.Image(image)})
process.SleepAbout1sTo2s()
} }
} }
return true return true
@ -87,7 +87,7 @@ func crew() (string, error) {
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return "", errors.New("status not ok") return "", errors.New("status not ok")
} }
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -149,7 +149,7 @@ func crew() (string, error) {
if respw.StatusCode != http.StatusOK { if respw.StatusCode != http.StatusOK {
return "", errors.New("status not ok") return "", errors.New("status not ok")
} }
bw, _ := ioutil.ReadAll(respw.Body) bw, _ := io.ReadAll(respw.Body)
today, err := regexp.Compile(time.Now().Format("2006-01-02")) today, err := regexp.Compile(time.Now().Format("2006-01-02"))
if err != nil { if err != nil {
return "", err return "", err