diff --git a/control/rule.go b/control/rule.go index 1d0507a9..70aae988 100644 --- a/control/rule.go +++ b/control/rule.go @@ -5,12 +5,13 @@ import ( "crypto/md5" "encoding/binary" "fmt" - "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" "os" "strconv" "strings" "sync" + "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" + log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension" diff --git a/plugin_book_review/book_review.go b/plugin_book_review/book_review.go index a1bc89c2..75ea2a0a 100644 --- a/plugin_book_review/book_review.go +++ b/plugin_book_review/book_review.go @@ -2,12 +2,13 @@ package bookreview import ( - "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" "github.com/wdvxdr1123/ZeroBot/utils/helper" + "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" + "github.com/FloatTech/ZeroBot-Plugin/control" ) diff --git a/plugin_mocking_bird/data.go b/plugin_mocking_bird/data.go index 8d4005f2..24c2b023 100644 --- a/plugin_mocking_bird/data.go +++ b/plugin_mocking_bird/data.go @@ -1,10 +1,12 @@ package mockingbird import ( + "os" + + "github.com/sirupsen/logrus" + "github.com/FloatTech/ZeroBot-Plugin/utils/file" "github.com/FloatTech/ZeroBot-Plugin/utils/process" - "github.com/sirupsen/logrus" - "os" ) // 加载数据库 diff --git a/plugin_mocking_bird/mocking_bird.go b/plugin_mocking_bird/mocking_bird.go index b22c66e6..917e0edd 100644 --- a/plugin_mocking_bird/mocking_bird.go +++ b/plugin_mocking_bird/mocking_bird.go @@ -3,16 +3,6 @@ package mockingbird import ( "bytes" - "github.com/FloatTech/ZeroBot-Plugin/control" - "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke" - fileutil "github.com/FloatTech/ZeroBot-Plugin/utils/file" - "github.com/FloatTech/ZeroBot-Plugin/utils/web" - log "github.com/sirupsen/logrus" - "github.com/tidwall/gjson" - zero "github.com/wdvxdr1123/ZeroBot" - "github.com/wdvxdr1123/ZeroBot/extension/rate" - "github.com/wdvxdr1123/ZeroBot/message" - "github.com/wdvxdr1123/ZeroBot/utils/helper" "io" "io/ioutil" "mime/multipart" @@ -20,6 +10,18 @@ import ( "os" "strconv" "time" + + log "github.com/sirupsen/logrus" + "github.com/tidwall/gjson" + zero "github.com/wdvxdr1123/ZeroBot" + "github.com/wdvxdr1123/ZeroBot/extension/rate" + "github.com/wdvxdr1123/ZeroBot/message" + "github.com/wdvxdr1123/ZeroBot/utils/helper" + + "github.com/FloatTech/ZeroBot-Plugin/control" + qingyunke "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke" + fileutil "github.com/FloatTech/ZeroBot-Plugin/utils/file" + "github.com/FloatTech/ZeroBot-Plugin/utils/web" ) const ( @@ -58,7 +60,6 @@ func init() { fileName := getWav(textReply, syntPath, vocoderList[1], ctx.Event.UserID) // 回复 ctx.SendChain(message.Record("file:///" + fileutil.BOTPATH + "/" + cachePath + fileName)) - }) } diff --git a/plugin_novel/qianbi.go b/plugin_novel/qianbi.go index 16f87343..c181f629 100644 --- a/plugin_novel/qianbi.go +++ b/plugin_novel/qianbi.go @@ -3,7 +3,6 @@ package novel import ( "fmt" - "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" "io/ioutil" "net/http" "net/http/cookiejar" @@ -12,6 +11,8 @@ import ( "strings" "time" + "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" + "github.com/antchfx/htmlquery" log "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/plugin_omikuji/sensou.go b/plugin_omikuji/sensou.go index f1fd6f08..05ea26e1 100644 --- a/plugin_omikuji/sensou.go +++ b/plugin_omikuji/sensou.go @@ -3,12 +3,14 @@ package omikuji import ( "fmt" - "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" - "github.com/wdvxdr1123/ZeroBot/utils/helper" "math/rand" "strconv" "time" + "github.com/wdvxdr1123/ZeroBot/utils/helper" + + "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" + log "github.com/sirupsen/logrus" "github.com/FloatTech/ZeroBot-Plugin/control" diff --git a/plugin_shindan/shindan.go b/plugin_shindan/shindan.go index 0462700b..193baf02 100644 --- a/plugin_shindan/shindan.go +++ b/plugin_shindan/shindan.go @@ -2,10 +2,12 @@ package shindan import ( - "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" + "time" + log "github.com/sirupsen/logrus" "github.com/wdvxdr1123/ZeroBot/utils/helper" - "time" + + "github.com/FloatTech/ZeroBot-Plugin/utils/txt2img" "github.com/FloatTech/AnimeAPI/shindanmaker" zero "github.com/wdvxdr1123/ZeroBot" diff --git a/utils/txt2img/txt2img.go b/utils/txt2img/txt2img.go index d344d92d..e590afc3 100644 --- a/utils/txt2img/txt2img.go +++ b/utils/txt2img/txt2img.go @@ -4,14 +4,16 @@ package txt2img import ( "bytes" "encoding/base64" - "github.com/FloatTech/ZeroBot-Plugin/utils/file" - "github.com/FloatTech/ZeroBot-Plugin/utils/process" - "github.com/fogleman/gg" - "github.com/mattn/go-runewidth" - log "github.com/sirupsen/logrus" "image/jpeg" "os" "strings" + + "github.com/fogleman/gg" + "github.com/mattn/go-runewidth" + log "github.com/sirupsen/logrus" + + "github.com/FloatTech/ZeroBot-Plugin/utils/file" + "github.com/FloatTech/ZeroBot-Plugin/utils/process" ) const (