diff --git a/go.mod b/go.mod index 34364bae..1a32fb85 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.19 require ( github.com/Baidu-AIP/golang-sdk v1.1.1 github.com/Coloured-glaze/gg v1.3.4 - github.com/FloatTech/AnimeAPI v1.6.0 + github.com/FloatTech/AnimeAPI v1.6.1-0.20221202095042-1ddf79b3d454 github.com/FloatTech/floatbox v0.0.0-20221202084309-ad154513ab2f - github.com/FloatTech/sqlite v1.5.2 + github.com/FloatTech/sqlite v1.5.4 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b - github.com/FloatTech/zbpctrl v1.5.3-0.20221202072935-cef111dfc99b - github.com/FloatTech/zbputils v1.6.1-0.20221202084512-c16e3b531075 + github.com/FloatTech/zbpctrl v1.5.3-0.20221202094638-d701a364e4a2 + github.com/FloatTech/zbputils v1.6.1-0.20221202094910-19910896e8b9 github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 github.com/antchfx/htmlquery v1.2.5 @@ -21,7 +21,6 @@ require ( github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6 github.com/fumiama/gotracemoe v0.0.3 github.com/fumiama/jieba v0.0.0-20221130083937-35ac98dc5feb - github.com/fumiama/sqlite3 v1.20.0 github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/jinzhu/gorm v1.9.16 @@ -88,6 +87,9 @@ require ( modernc.org/libc v1.21.5 // indirect modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.4.0 // indirect + modernc.org/sqlite v1.20.0 // indirect ) +replace modernc.org/sqlite => github.com/fumiama/sqlite3 v1.20.0-simp + replace github.com/remyoudompheng/bigfft => github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b diff --git a/go.sum b/go.sum index ab522565..1a492ec5 100644 --- a/go.sum +++ b/go.sum @@ -4,20 +4,20 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/Coloured-glaze/gg v1.3.4 h1:l31zIF/HaVwkzjrj+A56RGQoSKyKuR1IWtIrqXGFStI= github.com/Coloured-glaze/gg v1.3.4/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/FloatTech/AnimeAPI v1.6.0 h1:y7wFL6huEVhL/n8elpFoYm3YSxwXZGrlhScpA2gZQME= -github.com/FloatTech/AnimeAPI v1.6.0/go.mod h1:YbhdF9X+IDTzWuZd8cDewAMY+0TN/1TkktXOCbAlj/Y= +github.com/FloatTech/AnimeAPI v1.6.1-0.20221202095042-1ddf79b3d454 h1:7O8Rr2PD4k+ovyrqdAvO3ueeiIII0nyGix7rAOwDWpE= +github.com/FloatTech/AnimeAPI v1.6.1-0.20221202095042-1ddf79b3d454/go.mod h1:TMR2hpgNisTnQ/SEGj3BvLHoQWCgdAJZLnbf5jGBAxo= github.com/FloatTech/floatbox v0.0.0-20221202084309-ad154513ab2f h1:fh4BuiOY+rDUBsf5bdIa3ta9PlcWGlf1Iu+Lyh4BJyg= github.com/FloatTech/floatbox v0.0.0-20221202084309-ad154513ab2f/go.mod h1:m5Mp6l0BgwiM9u1EyT4p1bu7zRdKQLOHtgr8xSP2Uw8= github.com/FloatTech/rendercard v0.0.2-0.20221128165614-a41216d2422e h1:7bF01RHsYS99Zp+OWfob1W/Cymho6fcggoRSpiuiYB8= github.com/FloatTech/rendercard v0.0.2-0.20221128165614-a41216d2422e/go.mod h1:e2M5OWspdblwq182zbVgRefiOc+gXtB1XzTW/2z86/I= -github.com/FloatTech/sqlite v1.5.2 h1:EwmtBbWEcoKn/I0YqMX9stuGjAf4ki/b7ZUGg9KMpIQ= -github.com/FloatTech/sqlite v1.5.2/go.mod h1:TuEVDbR7WMoYoPvnn42/VpyxUyUADWbTsWVhbw9cDTs= +github.com/FloatTech/sqlite v1.5.4 h1:f4HFyF+ziS3VdhhptdwFyVBGxgn2izRD6nQOBTKyl3I= +github.com/FloatTech/sqlite v1.5.4/go.mod h1:wiETjtOKD5l5CKDqDktlNL2DoZogngln7AE/jbNOu5Y= 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.3-0.20221202072935-cef111dfc99b h1:q3sV95/54o8qCMl7/rCkhjLnN72arVL2Go6MK5+k1fg= -github.com/FloatTech/zbpctrl v1.5.3-0.20221202072935-cef111dfc99b/go.mod h1:Akkg/LaAB54lZtiurwTSAAcOVTwn72im+TODVRqFLX4= -github.com/FloatTech/zbputils v1.6.1-0.20221202084512-c16e3b531075 h1:5jyzeM0pNFS2+UP5V6obvvGsorCwh3lg4O1NBRRz1Jg= -github.com/FloatTech/zbputils v1.6.1-0.20221202084512-c16e3b531075/go.mod h1:Rr1yEsiMbbmMfIAOtT/lSnZVOj5kmEvCJqdxAJqK5xg= +github.com/FloatTech/zbpctrl v1.5.3-0.20221202094638-d701a364e4a2 h1:GxWf5BtK1rhSGpSiR7jw8xcX9wPj8jsErPV1b/CYV+8= +github.com/FloatTech/zbpctrl v1.5.3-0.20221202094638-d701a364e4a2/go.mod h1:G9xyzfgp2O7onRz/cAlnX/mY6+LvCe7SYs/vejWRBhU= +github.com/FloatTech/zbputils v1.6.1-0.20221202094910-19910896e8b9 h1:uN2gXixus9ZZhNbSF8LYE3TdNZ88M51+Ps65mhHU75M= +github.com/FloatTech/zbputils v1.6.1-0.20221202094910-19910896e8b9/go.mod h1:/EW7JpNyPm7RKOFW0VCtaaFYM4icw+c7wVAkZPUxiqs= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA= github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w= @@ -66,8 +66,8 @@ github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6 github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40= github.com/fumiama/jieba v0.0.0-20221130083937-35ac98dc5feb h1:yqhUp1HeNkpLZYrQ6Byxy7iMt8I7VcjTywzsqjUuYyw= github.com/fumiama/jieba v0.0.0-20221130083937-35ac98dc5feb/go.mod h1:UUEvyLTJ7yoOA/viKG4wEis4ERydM7+Ny6gZUWgkS80= -github.com/fumiama/sqlite3 v1.20.0 h1:Lsdl6WOiKK5IbtbRgN3j99QVX0DjeM052+CYDp0+ABE= -github.com/fumiama/sqlite3 v1.20.0/go.mod h1:Xa/vRB/jo9QobtDK6vF+8ZMfDvkhN/8D6uo5gwKKzbM= +github.com/fumiama/sqlite3 v1.20.0-simp h1:5Ppxix+LQdEULdxdSjerIW+V5qV2a/E+P2RQ1c1jnvE= +github.com/fumiama/sqlite3 v1.20.0-simp/go.mod h1:Os58MHwYCcYZCy2PGChBrQtBAw5/LS1ZZOkfc+C/I7s= github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949 h1:VAzR8aoS2SCEBmRF9rqCPyXgXoP8mZ1viNL4mLWUg0Q= github.com/fumiama/unibase2n v0.0.0-20221003115227-e7db987de949/go.mod h1:lEaZsT4FRSqcjnQ5q8y+mkenkzR/r1D3BJmfdp0vqDg= github.com/gabriel-vasile/mimetype v1.0.4 h1:uBejfH8l3/2f+5vjl1e4xIaSyNEhRBZ5N/ij7ohpNd8= diff --git a/plugin/bilibili/bilibilimodel.go b/plugin/bilibili/bilibilimodel.go index b0138771..3fce1d01 100644 --- a/plugin/bilibili/bilibilimodel.go +++ b/plugin/bilibili/bilibilimodel.go @@ -5,7 +5,6 @@ import ( "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/bilibilipushmodel.go b/plugin/bilibili/bilibilipushmodel.go index 067422bc..70f6c9ee 100644 --- a/plugin/bilibili/bilibilipushmodel.go +++ b/plugin/bilibili/bilibilipushmodel.go @@ -4,7 +4,6 @@ import ( "encoding/json" "os" - _ "github.com/fumiama/sqlite3" // import sql "github.com/jinzhu/gorm" ) diff --git a/plugin/qzone/model.go b/plugin/qzone/model.go index 0d47e89a..7c1a22a6 100644 --- a/plugin/qzone/model.go +++ b/plugin/qzone/model.go @@ -4,7 +4,6 @@ import ( "fmt" "os" - _ "github.com/fumiama/sqlite3" // use sql "github.com/jinzhu/gorm" ) diff --git a/plugin/score/model.go b/plugin/score/model.go index fab21fe2..65145fbc 100644 --- a/plugin/score/model.go +++ b/plugin/score/model.go @@ -4,7 +4,6 @@ import ( "os" "time" - _ "github.com/fumiama/sqlite3" // import sql "github.com/jinzhu/gorm" ) diff --git a/plugin/sleep_manage/model.go b/plugin/sleep_manage/model.go index 7381138f..fda86b86 100644 --- a/plugin/sleep_manage/model.go +++ b/plugin/sleep_manage/model.go @@ -4,7 +4,6 @@ import ( "os" "time" - _ "github.com/fumiama/sqlite3" // use sql "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" ) diff --git a/plugin/thesaurus/chat.go b/plugin/thesaurus/chat.go index c2c78b89..3ba82c1d 100644 --- a/plugin/thesaurus/chat.go +++ b/plugin/thesaurus/chat.go @@ -34,13 +34,18 @@ func init() { if gid == 0 { gid = -ctx.Event.UserID } + var err error switch ctx.State["regex_matched"].([]string)[1] { case "kimo": - c.SetData(gid, TYPKIMO) + err = c.SetData(gid, tKIMO) case "傲娇": - c.SetData(gid, TYPDERE) + err = c.SetData(gid, tDERE) case "可爱": - c.SetData(gid, TYPKAWA) + err = c.SetData(gid, tKAWA) + } + if err != nil { + ctx.SendChain(message.Text("ERROR: ", err)) + return } }) go func() { @@ -86,13 +91,13 @@ func init() { } logrus.Infoln("[thesaurus]加载", len(chatListD), "条傲娇词库", len(chatListK), "条可爱词库") - engine.OnMessage(canmatch(TYPKIMO), + engine.OnMessage(canmatch(tKIMO), ctxext.JiebaFullMatch(seg, getmsg, chatList...), ).SetBlock(false).Handle(randreply(kimomap)) - engine.OnMessage(canmatch(TYPDERE), + engine.OnMessage(canmatch(tDERE), ctxext.JiebaFullMatch(seg, getmsg, chatListD...), ).SetBlock(false).Handle(randreply(sm.D)) - engine.OnMessage(canmatch(TYPKAWA), + engine.OnMessage(canmatch(tKAWA), ctxext.JiebaFullMatch(seg, getmsg, chatListK...), ).SetBlock(false).Handle(randreply(sm.K)) }() @@ -130,9 +135,9 @@ func (f *mockfile) Close() error { } const ( - TYPKIMO = iota - TYPDERE - TYPKAWA + tKIMO = iota + tDERE + tKAWA ) func canmatch(typ int64) zero.Rule { diff --git a/plugin/vtb_quotation/model/model.go b/plugin/vtb_quotation/model/model.go index 8bc4d7c4..01b86c72 100644 --- a/plugin/vtb_quotation/model/model.go +++ b/plugin/vtb_quotation/model/model.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/FloatTech/floatbox/web" - _ "github.com/fumiama/sqlite3" // import sql "github.com/jinzhu/gorm" log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" diff --git a/plugin/vtb_quotation/vtb_quotation.go b/plugin/vtb_quotation/vtb_quotation.go index 5a9dd502..8735c381 100644 --- a/plugin/vtb_quotation/vtb_quotation.go +++ b/plugin/vtb_quotation/vtb_quotation.go @@ -13,7 +13,6 @@ import ( "strings" "time" - _ "github.com/fumiama/sqlite3" // use sql zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" diff --git a/plugin/ymgal/model.go b/plugin/ymgal/model.go index a8704a0d..05914673 100644 --- a/plugin/ymgal/model.go +++ b/plugin/ymgal/model.go @@ -11,7 +11,6 @@ import ( "time" "github.com/antchfx/htmlquery" - _ "github.com/fumiama/sqlite3" // import sql "github.com/jinzhu/gorm" )