diff --git a/go.mod b/go.mod index d5bcd76e..76db98a5 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,11 @@ go 1.18 require ( github.com/Coloured-glaze/gg v1.3.2 - github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958 + github.com/FloatTech/AnimeAPI v1.5.1-0.20220816053000-8a1d0dd9500b + github.com/FloatTech/floatbox v0.0.0-20220816052111-cbf40c78757a github.com/FloatTech/sqlite v0.3.3 github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133 - github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa + github.com/FloatTech/zbputils v1.5.1-0.20220816052531-0efa59cfb7b5 github.com/antchfx/htmlquery v1.2.5 github.com/corona10/goimagehash v1.0.3 github.com/fumiama/cron v1.3.0 diff --git a/go.sum b/go.sum index 9b442661..74519c5c 100644 --- a/go.sum +++ b/go.sum @@ -10,16 +10,18 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Coloured-glaze/gg v1.3.2 h1:HRWF0qoIxwhO1O0N5eN2eTPwaO+xHpFu1FfNhtls22w= github.com/Coloured-glaze/gg v1.3.2/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg= -github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958 h1:BXjlcvPK/7IwaW1HTEPt/pMvbPrc3id1NfFkJ+lh1e4= -github.com/FloatTech/AnimeAPI v1.5.1-0.20220816023211-5e11b0d21958/go.mod h1:vhrzmpfFp9p4V1T+xY2OaFUAx498LmMxdk/UqJmPMTc= +github.com/FloatTech/AnimeAPI v1.5.1-0.20220816053000-8a1d0dd9500b h1:4oZlmvOdnA0fOIaaJ4NHLRhAq5JRkepAeL+uA4ajyVY= +github.com/FloatTech/AnimeAPI v1.5.1-0.20220816053000-8a1d0dd9500b/go.mod h1:Fa81LqDqCvA9ADI8JBwlD6WDBJ4uvsHHJz+XEu6qpvo= +github.com/FloatTech/floatbox v0.0.0-20220816052111-cbf40c78757a h1:g5qRftm3bA6hzkwjT7NqVe0XhZUFTU+QNcN/jvNiTFk= +github.com/FloatTech/floatbox v0.0.0-20220816052111-cbf40c78757a/go.mod h1:hK2HTQddBomA/sY2oD7VeW0GA5BxlIoYqcAOnamw1EU= github.com/FloatTech/sqlite v0.3.3 h1:cSlpv+DcIehqaUG2YyjW0Twh396FoGsybpEpFZnX3Jg= github.com/FloatTech/sqlite v0.3.3/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.4.1-0.20220715042842-93f081cb0133 h1:nP9NI4I+vtwAbiU7wCJwjuzCzMZ/yJYg8h3667HGnv0= github.com/FloatTech/zbpctrl v1.4.1-0.20220715042842-93f081cb0133/go.mod h1:72BnjyBwQWUC8mqM9dPk5ZrjxXCilQCVp+jfgHATNdw= -github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa h1:nltmv5w1cdB0vU52zkLFI9a5FdBozaAhZZq/GCLi6Xs= -github.com/FloatTech/zbputils v1.5.1-0.20220816020252-0f57a5ae28aa/go.mod h1:l06shz0lp4jqMBZDJaRRSUdOlIwg99cIKV4sx4YR0DI= +github.com/FloatTech/zbputils v1.5.1-0.20220816052531-0efa59cfb7b5 h1:zfOuaFNjJx1zIg6hCGVhVb12PXAP30gS+mXk6EShEX8= +github.com/FloatTech/zbputils v1.5.1-0.20220816052531-0efa59cfb7b5/go.mod h1:VChS4UO8fPnk08NJIvmjwkRpmh+Hzfm79gqEJqw/PhY= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= 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= diff --git a/main.go b/main.go index 247b2a7c..a1ce50e7 100644 --- a/main.go +++ b/main.go @@ -153,7 +153,7 @@ import ( // // // // // -----------------------以下为内置依赖，勿动------------------------ // - "github.com/FloatTech/zbputils/process" + "github.com/FloatTech/floatbox/process" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/driver" diff --git a/plugin/ai_reply/ai_tts.go b/plugin/ai_reply/ai_tts.go index 0ba5fa32..adf9b4d3 100644 --- a/plugin/ai_reply/ai_tts.go +++ b/plugin/ai_reply/ai_tts.go @@ -14,6 +14,7 @@ import ( "github.com/FloatTech/AnimeAPI/tts" "github.com/FloatTech/AnimeAPI/tts/baidutts" "github.com/FloatTech/AnimeAPI/tts/mockingbird" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" @@ -88,7 +89,7 @@ func init() { } } }) - engine.OnRegex(`^设置语音模式(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true). + engine.OnRegex(`^设置语音模式(.*)$`, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true). Handle(func(ctx *zero.Ctx) { param := ctx.State["regex_matched"].([]string)[1] err := t.setSoundMode(ctx, param) @@ -98,7 +99,7 @@ func init() { } ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，当前模式为", param)) }) - engine.OnRegex(`^设置默认语音模式(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true). + engine.OnRegex(`^设置默认语音模式(.*)$`, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, t)).SetBlock(true). Handle(func(ctx *zero.Ctx) { param := ctx.State["regex_matched"].([]string)[1] t.setDefaultSoundMode(param) diff --git a/plugin/atri/atri.go b/plugin/atri/atri.go index 1f5f1113..e0042165 100644 --- a/plugin/atri/atri.go +++ b/plugin/atri/atri.go @@ -12,9 +12,9 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/process" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/process" ) const ( diff --git a/plugin/bilibili/api.go b/plugin/bilibili/api.go index ec54542b..2b6eb2a4 100644 --- a/plugin/bilibili/api.go +++ b/plugin/bilibili/api.go @@ -7,8 +7,8 @@ import ( "net/http" "strconv" - "github.com/FloatTech/zbputils/binary" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" "github.com/tidwall/gjson" ) diff --git a/plugin/bilibili/bilibili.go b/plugin/bilibili/bilibili.go index 9b1069f0..e7c2742b 100644 --- a/plugin/bilibili/bilibili.go +++ b/plugin/bilibili/bilibili.go @@ -14,14 +14,14 @@ import ( "time" "github.com/Coloured-glaze/gg" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/img/writer" - "github.com/FloatTech/zbputils/web" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" @@ -44,7 +44,7 @@ func init() { cachePath := engine.DataFolder() + "cache/" _ = os.RemoveAll(cachePath) _ = os.MkdirAll(cachePath, 0755) - var getdb = ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + var getdb = fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { var err error _, _ = engine.GetLazyData("bilibili.db", false) vdb, err = initializeVup(engine.DataFolder() + "bilibili.db") diff --git a/plugin/bilibili/bilibilimodel.go b/plugin/bilibili/bilibilimodel.go index 10d4f4d0..423e12b2 100644 --- a/plugin/bilibili/bilibilimodel.go +++ b/plugin/bilibili/bilibilimodel.go @@ -3,8 +3,8 @@ package bilibili import ( "os" - "github.com/FloatTech/zbputils/binary" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" _ "github.com/fumiama/sqlite3" // use sql "github.com/jinzhu/gorm" "github.com/tidwall/gjson" diff --git a/plugin/bilibili/bilibilipush.go b/plugin/bilibili/bilibilipush.go index 9c959042..9b687d0b 100644 --- a/plugin/bilibili/bilibilipush.go +++ b/plugin/bilibili/bilibilipush.go @@ -13,11 +13,11 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/web" ) const ( diff --git a/plugin/bilibili/card2msg.go b/plugin/bilibili/card2msg.go index 9ff892f3..d0fdc3f7 100644 --- a/plugin/bilibili/card2msg.go +++ b/plugin/bilibili/card2msg.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/FloatTech/zbputils/binary" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" "github.com/tidwall/gjson" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin/book_review/book_review.go b/plugin/book_review/book_review.go index ce1bbcb3..a481b81f 100644 --- a/plugin/book_review/book_review.go +++ b/plugin/book_review/book_review.go @@ -8,10 +8,10 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/text" ) @@ -22,7 +22,7 @@ func init() { PublicDataFolder: "BookReview", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "bookreview.db" // os.RemoveAll(dbpath) _, _ = engine.GetLazyData("bookreview.db", true) diff --git a/plugin/chouxianghua/chouxianghua.go b/plugin/chouxianghua/chouxianghua.go index fe3156c9..2078a71e 100644 --- a/plugin/chouxianghua/chouxianghua.go +++ b/plugin/chouxianghua/chouxianghua.go @@ -8,9 +8,9 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" ) func init() { @@ -21,7 +21,7 @@ func init() { }) en.OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$", - ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = en.DataFolder() + "cxh.db" // os.RemoveAll(dbpath) _, _ = en.GetLazyData("cxh.db", true) diff --git a/plugin/coser/coser.go b/plugin/coser/coser.go index 4f6f1563..3d074550 100644 --- a/plugin/coser/coser.go +++ b/plugin/coser/coser.go @@ -10,10 +10,10 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" ) var ( diff --git a/plugin/cpstory/cpstory.go b/plugin/cpstory/cpstory.go index 7800f69c..32bcf747 100644 --- a/plugin/cpstory/cpstory.go +++ b/plugin/cpstory/cpstory.go @@ -9,10 +9,10 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/math" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/math" ) func init() { @@ -22,7 +22,7 @@ func init() { PublicDataFolder: "CpStory", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "cp.db" // os.RemoveAll(dbpath) _, _ = engine.GetLazyData("cp.db", true) diff --git a/plugin/curse/curse.go b/plugin/curse/curse.go index 384d48c5..378f5023 100644 --- a/plugin/curse/curse.go +++ b/plugin/curse/curse.go @@ -8,10 +8,11 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/process" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/process" ) const ( @@ -26,7 +27,7 @@ func init() { PublicDataFolder: "Curse", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "curse.db" _, err := engine.GetLazyData("curse.db", true) if err != nil { diff --git a/plugin/danbooru/main.go b/plugin/danbooru/main.go index 470c4226..b756bf50 100644 --- a/plugin/danbooru/main.go +++ b/plugin/danbooru/main.go @@ -6,10 +6,10 @@ import ( "encoding/hex" "github.com/FloatTech/AnimeAPI/danbooru" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/file" - "github.com/FloatTech/zbputils/img/writer" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" diff --git a/plugin/diana/bing.go b/plugin/diana/bing.go index f6df6304..38fb51ba 100644 --- a/plugin/diana/bing.go +++ b/plugin/diana/bing.go @@ -5,9 +5,9 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data" ) @@ -23,7 +23,7 @@ var engine = control.Register("diana", &ctrl.Options[*zero.Ctx]{ }) func init() { - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { err := data.LoadText(engine.DataFolder() + "text.db") if err != nil { ctx.SendChain(message.Text("ERROR:", err)) diff --git a/plugin/diana/data/text.go b/plugin/diana/data/text.go index 363ffcaf..8beb4a6b 100644 --- a/plugin/diana/data/text.go +++ b/plugin/diana/data/text.go @@ -6,9 +6,9 @@ import ( "encoding/binary" "time" + binutils "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" sql "github.com/FloatTech/sqlite" - binutils "github.com/FloatTech/zbputils/binary" - "github.com/FloatTech/zbputils/file" "github.com/sirupsen/logrus" ) diff --git a/plugin/diana/zhiwang.go b/plugin/diana/zhiwang.go index e01f9bcc..c6d98518 100644 --- a/plugin/diana/zhiwang.go +++ b/plugin/diana/zhiwang.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/FloatTech/zbputils/binary" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" "github.com/tidwall/gjson" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin/drift_bottle/data.go b/plugin/drift_bottle/data.go index 4627ed1e..21535975 100644 --- a/plugin/drift_bottle/data.go +++ b/plugin/drift_bottle/data.go @@ -6,8 +6,8 @@ import ( "strconv" "sync" + "github.com/FloatTech/floatbox/binary" sql "github.com/FloatTech/sqlite" - "github.com/FloatTech/zbputils/binary" ) type bottle struct { diff --git a/plugin/epidemic/epidemic.go b/plugin/epidemic/epidemic.go index 3a312a9f..799dc08a 100644 --- a/plugin/epidemic/epidemic.go +++ b/plugin/epidemic/epidemic.go @@ -7,10 +7,10 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" ) const ( diff --git a/plugin/font/main.go b/plugin/font/main.go index 7118118c..c6003d78 100644 --- a/plugin/font/main.go +++ b/plugin/font/main.go @@ -2,8 +2,8 @@ package font import ( + "github.com/FloatTech/floatbox/binary" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/text" diff --git a/plugin/fortune/fortune.go b/plugin/fortune/fortune.go index b62fe9d9..bcf8d6f2 100644 --- a/plugin/fortune/fortune.go +++ b/plugin/fortune/fortune.go @@ -17,13 +17,14 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/floatbox/math" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img/pool" - "github.com/FloatTech/zbputils/img/writer" - "github.com/FloatTech/zbputils/math" ) const ( @@ -87,7 +88,7 @@ func init() { } ctx.SendChain(message.Text("没有这个底图哦～")) }) - en.OnFullMatchGroup([]string{"运势", "抽签"}, ctxext.DoOnceOnSuccess( + en.OnFullMatchGroup([]string{"运势", "抽签"}, fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { data, err := file.GetLazyData(omikujson, false) if err != nil { @@ -139,7 +140,7 @@ func init() { } // 随机获取签文 - randtextindex := ctxext.RandSenderPerDayN(ctx.Event.UserID, len(omikujis)) + randtextindex := fcext.RandSenderPerDayN(ctx.Event.UserID, len(omikujis)) title, text := omikujis[randtextindex]["title"], omikujis[randtextindex]["content"] digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text)) cachefile := cache + hex.EncodeToString(digest[:]) @@ -171,7 +172,7 @@ func randimage(path string, ctx *zero.Ctx) (im image.Image, index int, err error } defer reader.Close() - file := reader.File[ctxext.RandSenderPerDayN(ctx.Event.UserID, len(reader.File))] + file := reader.File[fcext.RandSenderPerDayN(ctx.Event.UserID, len(reader.File))] f, err := file.Open() if err != nil { return diff --git a/plugin/funny/laugh.go b/plugin/funny/laugh.go index 36cecf36..4698a7dc 100644 --- a/plugin/funny/laugh.go +++ b/plugin/funny/laugh.go @@ -9,6 +9,7 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + fcext "github.com/FloatTech/floatbox/ctxext" sql "github.com/FloatTech/sqlite" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" @@ -30,7 +31,7 @@ func init() { PublicDataFolder: "Funny", }) - en.OnPrefixGroup([]string{"讲个笑话", "夸夸"}, ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + en.OnPrefixGroup([]string{"讲个笑话", "夸夸"}, fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = en.DataFolder() + "jokes.db" _, err := en.GetLazyData("jokes.db", true) if err != nil { diff --git a/plugin/genshin/ys.go b/plugin/genshin/ys.go index c97a5634..a9833749 100644 --- a/plugin/genshin/ys.go +++ b/plugin/genshin/ys.go @@ -13,11 +13,12 @@ import ( "strings" "sync/atomic" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/floatbox/process" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/img/writer" - "github.com/FloatTech/zbputils/process" "github.com/golang/freetype" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" @@ -66,7 +67,7 @@ func init() { } }) - engine.OnFullMatch("原神十连", ctxext.DoOnceOnSuccess( + engine.OnFullMatch("原神十连", fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { zipfile := engine.DataFolder() + "Genshin.zip" _, err := engine.GetLazyData("Genshin.zip", false) diff --git a/plugin/gif/context.go b/plugin/gif/context.go index efcf01f2..3a9921ab 100644 --- a/plugin/gif/context.go +++ b/plugin/gif/context.go @@ -5,7 +5,7 @@ import ( "strconv" "sync" - "github.com/FloatTech/zbputils/file" + "github.com/FloatTech/floatbox/file" "github.com/FloatTech/zbputils/img" "github.com/sirupsen/logrus" ) diff --git a/plugin/gif/gif.go b/plugin/gif/gif.go index d521f11b..53db8958 100644 --- a/plugin/gif/gif.go +++ b/plugin/gif/gif.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/Coloured-glaze/gg" + "github.com/FloatTech/floatbox/img/writer" "github.com/FloatTech/zbputils/img" - "github.com/FloatTech/zbputils/img/writer" ) // mo 摸 diff --git a/plugin/gif/logo.go b/plugin/gif/logo.go index c942294f..57575588 100644 --- a/plugin/gif/logo.go +++ b/plugin/gif/logo.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/FloatTech/zbputils/file" + "github.com/FloatTech/floatbox/file" "github.com/FloatTech/zbputils/img" ) diff --git a/plugin/gif/png.go b/plugin/gif/png.go index ced72bcc..75bc456a 100644 --- a/plugin/gif/png.go +++ b/plugin/gif/png.go @@ -9,10 +9,10 @@ import ( "sync" "github.com/Coloured-glaze/gg" - "github.com/FloatTech/zbputils/file" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/img/writer" ) // pa 爬 diff --git a/plugin/gif/run.go b/plugin/gif/run.go index f76e647e..75a15149 100644 --- a/plugin/gif/run.go +++ b/plugin/gif/run.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin/guessmusic/main.go b/plugin/guessmusic/main.go index f2582384..3d736b30 100644 --- a/plugin/guessmusic/main.go +++ b/plugin/guessmusic/main.go @@ -22,11 +22,11 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" - "github.com/FloatTech/zbputils/web" "github.com/wdvxdr1123/ZeroBot/extension/single" // 图片输出 diff --git a/plugin/hs/run.go b/plugin/hs/run.go index 2b4976d9..48b3079b 100644 --- a/plugin/hs/run.go +++ b/plugin/hs/run.go @@ -11,11 +11,11 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" - "github.com/FloatTech/zbputils/web" ) var reqconf = [...]string{"GET", "https://hs.fbigame.com", diff --git a/plugin/hyaku/main.go b/plugin/hyaku/main.go index f7f93b96..2016f518 100644 --- a/plugin/hyaku/main.go +++ b/plugin/hyaku/main.go @@ -10,11 +10,11 @@ import ( "strconv" "unsafe" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin/image_finder/keyword.go b/plugin/image_finder/keyword.go index 75e61d7d..4471ef5a 100644 --- a/plugin/image_finder/keyword.go +++ b/plugin/image_finder/keyword.go @@ -18,12 +18,12 @@ import ( "github.com/FloatTech/AnimeAPI/pixiv" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/pool" - "github.com/FloatTech/zbputils/web" ) type resultjson struct { diff --git a/plugin/jandan/jandan.go b/plugin/jandan/jandan.go index 5a78db34..890ae2ff 100644 --- a/plugin/jandan/jandan.go +++ b/plugin/jandan/jandan.go @@ -8,10 +8,10 @@ import ( "strconv" "time" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" "github.com/antchfx/htmlquery" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" @@ -29,7 +29,7 @@ func init() { PublicDataFolder: "Jandan", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "pics.db" _, _ = engine.GetLazyData("pics.db", false) err := db.Open(time.Hour * 24) diff --git a/plugin/lolicon/lolicon.go b/plugin/lolicon/lolicon.go index 1a2635bd..daa61b3b 100644 --- a/plugin/lolicon/lolicon.go +++ b/plugin/lolicon/lolicon.go @@ -10,13 +10,13 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/math" + "github.com/FloatTech/floatbox/process" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/pool" - "github.com/FloatTech/zbputils/math" - "github.com/FloatTech/zbputils/process" - "github.com/FloatTech/zbputils/web" ) const ( diff --git a/plugin/manager/gist.go b/plugin/manager/gist.go index 49b1ae5d..61fc60c0 100644 --- a/plugin/manager/gist.go +++ b/plugin/manager/gist.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/wdvxdr1123/ZeroBot/utils/helper" - "github.com/FloatTech/zbputils/math" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/math" + "github.com/FloatTech/floatbox/web" ) // user hash file diff --git a/plugin/manager/manager.go b/plugin/manager/manager.go index 704bc8d1..77cfeb81 100644 --- a/plugin/manager/manager.go +++ b/plugin/manager/manager.go @@ -13,12 +13,12 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/math" + "github.com/FloatTech/floatbox/process" sql "github.com/FloatTech/sqlite" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/math" - "github.com/FloatTech/zbputils/process" "github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer" ) diff --git a/plugin/manager/timer/timer.go b/plugin/manager/timer/timer.go index 17592132..281d33d2 100644 --- a/plugin/manager/timer/timer.go +++ b/plugin/manager/timer/timer.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/FloatTech/floatbox/process" sql "github.com/FloatTech/sqlite" - "github.com/FloatTech/zbputils/process" "github.com/fumiama/cron" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/plugin/midicreate/midicreate.go b/plugin/midicreate/midicreate.go index 79d58788..154e492b 100644 --- a/plugin/midicreate/midicreate.go +++ b/plugin/midicreate/midicreate.go @@ -14,12 +14,12 @@ import ( "strings" "time" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" - "github.com/FloatTech/zbputils/web" "github.com/pkg/errors" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin/moyu_calendar/calendar.go b/plugin/moyu_calendar/calendar.go index 1783ac2e..cf1f58e0 100644 --- a/plugin/moyu_calendar/calendar.go +++ b/plugin/moyu_calendar/calendar.go @@ -2,9 +2,9 @@ package moyucalendar import ( + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/web" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin/music/selecter.go b/plugin/music/selecter.go index c3cc66aa..b0f7810a 100644 --- a/plugin/music/selecter.go +++ b/plugin/music/selecter.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" diff --git a/plugin/nativesetu/data.go b/plugin/nativesetu/data.go index 90199038..6d3aa05a 100644 --- a/plugin/nativesetu/data.go +++ b/plugin/nativesetu/data.go @@ -13,8 +13,8 @@ import ( "github.com/sirupsen/logrus" _ "golang.org/x/image/webp" // import webp decoding + "github.com/FloatTech/floatbox/file" sql "github.com/FloatTech/sqlite" - "github.com/FloatTech/zbputils/file" ) // setuclass holds setus in a folder, which is the class name. diff --git a/plugin/nativesetu/main.go b/plugin/nativesetu/main.go index 1e5fe6d4..ba0b8ac4 100644 --- a/plugin/nativesetu/main.go +++ b/plugin/nativesetu/main.go @@ -10,10 +10,11 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" ) var ( @@ -42,7 +43,7 @@ func init() { } } - engine.OnRegex(`^本地(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns)).SetBlock(true). + engine.OnRegex(`^本地(.*)$`, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns)).SetBlock(true). Handle(func(ctx *zero.Ctx) { imgtype := ctx.State["regex_matched"].([]string)[1] sc := new(setuclass) @@ -63,7 +64,7 @@ func init() { ctx.SendChain(message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p)) } }) - engine.OnRegex(`^刷新本地(.*)$`, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns), zero.SuperUserPermission).SetBlock(true). + engine.OnRegex(`^刷新本地(.*)$`, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, ns), zero.SuperUserPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { imgtype := ctx.State["regex_matched"].([]string)[1] err := ns.scanclass(os.DirFS(setupath), imgtype, imgtype) diff --git a/plugin/nativewife/main.go b/plugin/nativewife/main.go index 93dfd1ce..c1c3b46f 100644 --- a/plugin/nativewife/main.go +++ b/plugin/nativewife/main.go @@ -16,9 +16,9 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/file" ) func init() { diff --git a/plugin/nihongo/nihongo.go b/plugin/nihongo/nihongo.go index a5691fa9..51f14c8f 100644 --- a/plugin/nihongo/nihongo.go +++ b/plugin/nihongo/nihongo.go @@ -4,10 +4,10 @@ package nihongo import ( "time" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/text" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" @@ -21,7 +21,7 @@ func init() { PublicDataFolder: "Nihongo", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "nihongo.db" _, err := engine.GetLazyData("nihongo.db", true) if err != nil { diff --git a/plugin/novel/qianbi.go b/plugin/novel/qianbi.go index 6a4aa777..da8f02d9 100644 --- a/plugin/novel/qianbi.go +++ b/plugin/novel/qianbi.go @@ -15,8 +15,8 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + ub "github.com/FloatTech/floatbox/binary" ctrl "github.com/FloatTech/zbpctrl" - ub "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/text" diff --git a/plugin/nsfw/main.go b/plugin/nsfw/main.go index 76187407..7250eba4 100644 --- a/plugin/nsfw/main.go +++ b/plugin/nsfw/main.go @@ -3,10 +3,10 @@ package nsfw import ( "github.com/FloatTech/AnimeAPI/nsfw" + "github.com/FloatTech/floatbox/process" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/process" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) diff --git a/plugin/omikuji/sensou.go b/plugin/omikuji/sensou.go index 0835455c..bc8a7681 100644 --- a/plugin/omikuji/sensou.go +++ b/plugin/omikuji/sensou.go @@ -10,6 +10,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" @@ -28,14 +29,14 @@ func init() { // 插件主体 engine.OnFullMatchGroup([]string{"求签", "占卜"}).SetBlock(true). Handle(func(ctx *zero.Ctx) { - i := ctxext.RandSenderPerDayN(ctx.Event.UserID, 100) + 1 + i := fcext.RandSenderPerDayN(ctx.Event.UserID, 100) + 1 ctx.SendChain( message.At(ctx.Event.UserID), message.Image(fmt.Sprintf(bed, i, 0)), message.Image(fmt.Sprintf(bed, i, 1)), ) }) - engine.OnFullMatch("解签", ctxext.DoOnceOnSuccess( + engine.OnFullMatch("解签", fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { db.DBPath = engine.DataFolder() + "kuji.db" _, err := engine.GetLazyData("kuji.db", true) @@ -65,7 +66,7 @@ func init() { // 插件主体 Handle(func(ctx *zero.Ctx) { kujiBytes, err := text.RenderToBase64( getKujiByBango( - uint8(ctxext.RandSenderPerDayN(ctx.Event.UserID, 100)+1), + uint8(fcext.RandSenderPerDayN(ctx.Event.UserID, 100)+1), ), text.FontFile, 400, 20, ) diff --git a/plugin/qqwife/qqmapwife.go b/plugin/qqwife/qqmapwife.go index 4eb5d220..55867877 100644 --- a/plugin/qqwife/qqmapwife.go +++ b/plugin/qqwife/qqmapwife.go @@ -11,10 +11,10 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/math" ctrl "github.com/FloatTech/zbpctrl" control "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/math" // 数据库 sql "github.com/FloatTech/sqlite" @@ -24,9 +24,10 @@ import ( // 画图 "github.com/Coloured-glaze/gg" - "github.com/FloatTech/zbputils/file" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/img/writer" ) //nolint: asciicheck @@ -290,7 +291,7 @@ func init() { "--------------------------------\n以下技能每人只能三选一\n CD12H，不跨天刷新\n--------------------------------\n" + "- (娶|嫁)@对方QQ\n- 当[对方Q号|@对方QQ]的小三\n- 闹离婚", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { 民政局.db.DBPath = engine.DataFolder() + "结婚登记表.db" // 如果数据库不存在则下载 // _, _ = engine.GetLazyData("结婚登记表.db", false) diff --git a/plugin/reborn/load.go b/plugin/reborn/load.go index c4403e83..ac8fa967 100644 --- a/plugin/reborn/load.go +++ b/plugin/reborn/load.go @@ -3,7 +3,7 @@ package reborn import ( "encoding/json" - "github.com/FloatTech/zbputils/file" + "github.com/FloatTech/floatbox/file" ) // load 加载rate数据 diff --git a/plugin/reborn/main.go b/plugin/reborn/main.go index bc1268cf..4ca98382 100644 --- a/plugin/reborn/main.go +++ b/plugin/reborn/main.go @@ -5,9 +5,9 @@ import ( "fmt" "math/rand" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" wr "github.com/mroth/weightedrand" "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" @@ -21,7 +21,7 @@ func init() { PublicDataFolder: "Reborn", }) - en.OnFullMatch("reborn", ctxext.DoOnceOnSuccess( + en.OnFullMatch("reborn", fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { datapath := en.DataFolder() jsonfile := datapath + "rate.json" diff --git a/plugin/saucenao/searcher.go b/plugin/saucenao/searcher.go index 7cbbf457..2df32975 100644 --- a/plugin/saucenao/searcher.go +++ b/plugin/saucenao/searcher.go @@ -16,11 +16,11 @@ import ( "github.com/FloatTech/AnimeAPI/pixiv" "github.com/jozsefsallai/gophersauce" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img/pool" ) diff --git a/plugin/scale/main.go b/plugin/scale/main.go index cde0be3e..54c4212a 100644 --- a/plugin/scale/main.go +++ b/plugin/scale/main.go @@ -21,14 +21,14 @@ import ( "github.com/FloatTech/AnimeAPI/nsfw" "github.com/FloatTech/AnimeAPI/scale" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img" - "github.com/FloatTech/zbputils/img/writer" - "github.com/FloatTech/zbputils/web" ) func init() { diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index 3ba51488..6ab6944c 100644 --- a/plugin/score/sign_in.go +++ b/plugin/score/sign_in.go @@ -15,15 +15,15 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" + "github.com/FloatTech/floatbox/binary" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/img/writer" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/img/writer" - "github.com/FloatTech/zbputils/web" ) const ( diff --git a/plugin/setutime/setu_geter.go b/plugin/setutime/setu_geter.go index fbe476a2..ee73e139 100644 --- a/plugin/setutime/setu_geter.go +++ b/plugin/setutime/setu_geter.go @@ -9,14 +9,15 @@ import ( "time" "github.com/FloatTech/AnimeAPI/pixiv" + fcext "github.com/FloatTech/floatbox/ctxext" + fileutil "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/math" + "github.com/FloatTech/floatbox/process" sql "github.com/FloatTech/sqlite" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - fileutil "github.com/FloatTech/zbputils/file" imagepool "github.com/FloatTech/zbputils/img/pool" - "github.com/FloatTech/zbputils/math" - "github.com/FloatTech/zbputils/process" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" ) @@ -60,7 +61,7 @@ func init() { // 插件主体 PublicDataFolder: "SetuTime", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { // 如果数据库不存在则下载 pool.db.DBPath = engine.DataFolder() + "SetuTime.db" _, _ = engine.GetLazyData("SetuTime.db", false) @@ -78,7 +79,7 @@ func init() { // 插件主体 return true }) - engine.OnRegex(`^来份(.+)$`, getdb, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool)).SetBlock(true).Limit(ctxext.LimitByUser). + engine.OnRegex(`^来份(.+)$`, getdb, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool)).SetBlock(true).Limit(ctxext.LimitByUser). Handle(func(ctx *zero.Ctx) { var imgtype = ctx.State["regex_matched"].([]string)[1] // 补充池子 @@ -112,7 +113,7 @@ func init() { // 插件主体 ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id)) }) - engine.OnRegex(`^删除\s*([^0-9\s]+)\s*(\d+)$`, getdb, ctxext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool), zero.SuperUserPermission).SetBlock(true). + engine.OnRegex(`^删除\s*([^0-9\s]+)\s*(\d+)$`, getdb, fcext.ValueInList(func(ctx *zero.Ctx) string { return ctx.State["regex_matched"].([]string)[1] }, pool), zero.SuperUserPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { var ( imgtype = ctx.State["regex_matched"].([]string)[1] diff --git a/plugin/shadiao/shadiao.go b/plugin/shadiao/shadiao.go index 8dacb01b..c253761d 100644 --- a/plugin/shadiao/shadiao.go +++ b/plugin/shadiao/shadiao.go @@ -2,10 +2,10 @@ package shadiao import ( + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" "github.com/tidwall/gjson" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" diff --git a/plugin/shadiao/sweetnothings.go b/plugin/shadiao/sweetnothings.go index f6d0358e..d45ac021 100644 --- a/plugin/shadiao/sweetnothings.go +++ b/plugin/shadiao/sweetnothings.go @@ -6,8 +6,8 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/floatbox/web" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" ) func init() { diff --git a/plugin/shadiao/yduanzi.go b/plugin/shadiao/yduanzi.go index 7703cbae..6d2240b1 100644 --- a/plugin/shadiao/yduanzi.go +++ b/plugin/shadiao/yduanzi.go @@ -8,8 +8,8 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/floatbox/web" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" ) func init() { diff --git a/plugin/tarot/tarot.go b/plugin/tarot/tarot.go index 47c61d1e..d1b65a04 100644 --- a/plugin/tarot/tarot.go +++ b/plugin/tarot/tarot.go @@ -8,8 +8,9 @@ import ( "strconv" "strings" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" "github.com/FloatTech/zbputils/img/text" @@ -55,7 +56,7 @@ func init() { PublicDataFolder: "Tarot", }).ApplySingle(ctxext.DefaultSingle) - getTarot := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getTarot := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { data, err := engine.GetLazyData("tarots.json", true) if err != nil { ctx.SendChain(message.Text("ERROR:", err)) diff --git a/plugin/tiangou/tiangou.go b/plugin/tiangou/tiangou.go index d37a69b3..805e3071 100644 --- a/plugin/tiangou/tiangou.go +++ b/plugin/tiangou/tiangou.go @@ -4,6 +4,7 @@ package tiangou import ( "time" + fcext "github.com/FloatTech/floatbox/ctxext" sql "github.com/FloatTech/sqlite" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" @@ -28,7 +29,7 @@ func init() { PublicDataFolder: "Tiangou", }) - en.OnFullMatch("舔狗日记", ctxext.DoOnceOnSuccess( + en.OnFullMatch("舔狗日记", fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { db.DBPath = en.DataFolder() + "tiangou.db" _, err := en.GetLazyData("tiangou.db", true) diff --git a/plugin/vtb_quotation/model/model.go b/plugin/vtb_quotation/model/model.go index d8831d0e..10dd3323 100644 --- a/plugin/vtb_quotation/model/model.go +++ b/plugin/vtb_quotation/model/model.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/web" _ "github.com/fumiama/sqlite3" // import sql "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" diff --git a/plugin/vtb_quotation/vtb_quotation.go b/plugin/vtb_quotation/vtb_quotation.go index 40dee1ce..fc9fd3ec 100644 --- a/plugin/vtb_quotation/vtb_quotation.go +++ b/plugin/vtb_quotation/vtb_quotation.go @@ -18,12 +18,12 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img/text" - "github.com/FloatTech/zbputils/web" "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model" ) @@ -38,7 +38,7 @@ func init() { }) dbfile := engine.DataFolder() + "vtb.db" storePath := engine.DataFolder() + "store/" - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { err := os.MkdirAll(storePath, 0755) if err != nil { ctx.SendChain(message.Text("ERROR:", err)) diff --git a/plugin/wangyiyun/main.go b/plugin/wangyiyun/main.go index 246f752a..af976ace 100644 --- a/plugin/wangyiyun/main.go +++ b/plugin/wangyiyun/main.go @@ -2,10 +2,10 @@ package wangyiyun import ( + "github.com/FloatTech/floatbox/web" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/web" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" diff --git a/plugin/word_count/word_count.go b/plugin/word_count/word_count.go index b8c96a7a..4a115fa7 100644 --- a/plugin/word_count/word_count.go +++ b/plugin/word_count/word_count.go @@ -11,11 +11,12 @@ import ( "sync" "time" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/file" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/file" "github.com/FloatTech/zbputils/img/text" "github.com/golang/freetype" "github.com/sirupsen/logrus" @@ -40,7 +41,7 @@ func init() { cachePath := engine.DataFolder() + "cache/" _ = os.RemoveAll(cachePath) _ = os.MkdirAll(cachePath, 0755) - engine.OnRegex(`^热词\s?(\d*)\s?(\d*)$`, zero.OnlyGroup, ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + engine.OnRegex(`^热词\s?(\d*)\s?(\d*)$`, zero.OnlyGroup, fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { _, err := engine.GetLazyData("stopwords.txt", false) if err != nil { ctx.SendChain(message.Text("ERROR:", err)) diff --git a/plugin/wordle/wordle.go b/plugin/wordle/wordle.go index 7db02abf..5a206130 100644 --- a/plugin/wordle/wordle.go +++ b/plugin/wordle/wordle.go @@ -15,11 +15,12 @@ import ( "github.com/FloatTech/AnimeAPI/tl" "github.com/Coloured-glaze/gg" + "github.com/FloatTech/floatbox/binary" + fcext "github.com/FloatTech/floatbox/ctxext" + "github.com/FloatTech/floatbox/img/writer" ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" - "github.com/FloatTech/zbputils/img/writer" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension/single" "github.com/wdvxdr1123/ZeroBot/message" @@ -79,7 +80,7 @@ func init() { }), )) - en.OnRegex(`^(个人|团队)(五阶|六阶|七阶)?猜单词$`, zero.OnlyGroup, ctxext.DoOnceOnSuccess( + en.OnRegex(`^(个人|团队)(五阶|六阶|七阶)?猜单词$`, zero.OnlyGroup, fcext.DoOnceOnSuccess( func(ctx *zero.Ctx) bool { var errcnt uint32 var wg sync.WaitGroup diff --git a/plugin/wtf/model.go b/plugin/wtf/model.go index 88a02d2b..3a6ee04f 100644 --- a/plugin/wtf/model.go +++ b/plugin/wtf/model.go @@ -5,7 +5,7 @@ import ( "errors" "net/url" - "github.com/FloatTech/zbputils/web" + "github.com/FloatTech/floatbox/web" ) /* JS path getter for https://wtf.hiigara.net/ranking diff --git a/plugin/ymgal/ymgal.go b/plugin/ymgal/ymgal.go index ff181597..be0e8029 100644 --- a/plugin/ymgal/ymgal.go +++ b/plugin/ymgal/ymgal.go @@ -4,6 +4,7 @@ package ymgal import ( "strings" + fcext "github.com/FloatTech/floatbox/ctxext" ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/control" "github.com/FloatTech/zbputils/ctxext" @@ -17,7 +18,7 @@ func init() { Help: "月幕galgame\n- 随机galCG\n- 随机gal表情包\n- galCG[xxx]\n- gal表情包[xxx]\n- 更新gal\n", PublicDataFolder: "Ymgal", }) - getdb := ctxext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { + getdb := fcext.DoOnceOnSuccess(func(ctx *zero.Ctx) bool { dbfile := engine.DataFolder() + "ymgal.db" _, err := engine.GetLazyData("ymgal.db", false) if err != nil {