🐛 fix: aireply 表情

.gitignore

@@ -1,15 +1,3 @@
-data/SetuTime/cache
-data/control
-data/SetuTime/search
-data/manager
-data/acgimage
-data/saucenao
-data/fortune
-data/hs
-data/nsetu
-data/nwife
-data/sleep
-data/score
 plugins/*.so
 plugins/*.dll
 .idea/

README.md

@@ -154,12 +154,14 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 搜图[P站图片ID]
 - **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"`
     - [x] 搜番|搜索番剧[图片]
-- **随机图片与AI点评** `github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
+- **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
     - [x] 随机图片(评级大于6的图将私发)
     - [x] 直接随机(无r18检测，务必小心，仅管理可用)
     - [x] 设置随机图片网址[url]
     - [x] 太涩了(撤回最近发的图)
     - [x] 评价图片(发送一张图片让bot评分)
+- **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru`
+    - [x] 鉴赏图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
     - [x] 运势|抽签
     - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]

go.mod

@@ -3,8 +3,8 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.2.0
-	github.com/FloatTech/zbputils v1.2.3-add6
+	github.com/FloatTech/AnimeAPI v1.2.3
+	github.com/FloatTech/zbputils v1.2.3-add9
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
@@ -36,17 +36,15 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.9 // indirect
 	github.com/tklauser/numcpus v0.3.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
 	golang.org/x/mod v0.5.1 // indirect
 	golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
 	golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect

go.sum

@@ -1,9 +1,8 @@
-github.com/FloatTech/AnimeAPI v1.2.0 h1:1P6hOEqNOB8EeC7PD5LuIRL9aWRKNVjKF6kP8X1ZYmI=
-github.com/FloatTech/AnimeAPI v1.2.0/go.mod h1:P2pJSBhflFXJsJPUwhHt13obMVBRc9WJxEKx4bJ+11Q=
+github.com/FloatTech/AnimeAPI v1.2.3 h1:NywV8PxKun6oDcKndsrUKT8l7vHGnf0rm5sRrSZ7qSc=
+github.com/FloatTech/AnimeAPI v1.2.3/go.mod h1:feTdgda0dckTeNl5VCXYlYEgN0wQbrca7TjIlZyph4o=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/zbputils v1.2.3-add1/go.mod h1:+NZ6tqt9lR2ilyiIh/+90tZlSW2pXx0IyOFlpOiqadE=
-github.com/FloatTech/zbputils v1.2.3-add6 h1:OposCMCRJYd0FLxPEMYFfUaBt9jso1cOUjGAKOeAYUE=
-github.com/FloatTech/zbputils v1.2.3-add6/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es=
+github.com/FloatTech/zbputils v1.2.3-add9 h1:lovWc7uvaqSww1TV8/BlGZNf5o2jBUgU4VIlXCusgrI=
+github.com/FloatTech/zbputils v1.2.3-add9/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
@@ -94,10 +93,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.10 h1:MLn+5bFRlWMGoSRmJour3CL1w/qL96mvipqpwQW/Sfk=
 github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -117,7 +114,6 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/shirou/gopsutil/v3 v3.21.12 h1:VoGxEW2hpmz0Vt3wUvHIl9fquzYLNpVpgNNB7pGJimA=
 github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
@@ -161,10 +157,9 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
-golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
+golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -259,7 +254,6 @@ modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60
 modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
 modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
 modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag=
-modernc.org/ccgo/v3 v3.11.2/go.mod h1:6kii3AptTDI+nUrM9RFBoIEUEisSWCbdczD9ZwQH2FE=
 modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw=
 modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ=
 modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c=
@@ -304,7 +298,6 @@ modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
 modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg=
 modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M=
-modernc.org/libc v1.11.3/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
 modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
 modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE=
 modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso=
@@ -352,14 +345,11 @@ modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
 modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.13.0/go.mod h1:2qO/6jZJrcQaxFUHxOwa6Q6WfiGSsiVj6GXX0Ker+Jg=
 modernc.org/sqlite v1.14.4 h1:F3DRiVZKnCLqIQ0LhEGqBLnw9LcdADciCwCIHQ8bD5g=
 modernc.org/sqlite v1.14.4/go.mod h1:LWtcO8JtBrt29KKmTqNNXDjAn36vHa/3nHvOYoVIAjc=
 modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/tcl v1.5.9/go.mod h1:bcwjvBJ2u0exY6K35eAmxXBBij5kXb1dHlAWmfhqThE=
 modernc.org/tcl v1.10.0/go.mod h1:WzWapmP/7dHVhFoyPpEaNSVTL8xtewhouN/cqSJ5A2s=
 modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.1.2/go.mod h1:sj9T1AGBG0dm6SCVzldPOHWrif6XBpooJtbttMn1+Js=
 modernc.org/z v1.2.21/go.mod h1:uXrObx4pGqXWIMliC5MiKuwAyMrltzwpteOFUP1PWCc=

main.go

@@ -27,13 +27,12 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation"  // 翻译
 
 	// 娱乐类
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"    // 鬼东西
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"       // 鬼东西
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"     // 服务器监控
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_book_review"  // 哀伤雪刃吧推书记录
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_cangtoushi"   // 藏头诗
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_choose"       // 选择困难症帮手
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chouxianghua" // 说抽象话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser"        // 三次元小姐姐
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_cpstory"      // cp短打
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse"        // 骂人
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_fortune"      // 运势
@@ -58,6 +57,8 @@ import (
 	// 二次元图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage"      // 随机图片与AI点评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"        // 随机老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser"         // 三次元小姐姐
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru"      // DeepDanbooru二次元图标签识别
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"  // 关键字搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"       // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"    // 本地涩图

plugin_ai_reply/main.go

@@ -37,10 +37,11 @@ func init() { // 插件主体
 			// 回复
 			time.Sleep(time.Second * 1)
 			if ctx.Event.MessageType == "group" {
-				ctx.SendChain(message.Reply(ctx.Event.MessageID), reply)
+				reply = append(reply, message.Reply(ctx.Event.MessageID))
+				ctx.Send(reply)
 				return
 			}
-			ctx.SendChain(reply)
+			ctx.Send(reply)
 		})
 	engine.OnPrefix(`设置回复模式`).SetBlock(true).SetPriority(20).
 		Handle(func(ctx *zero.Ctx) {

plugin_book_review/book_review.go

@@ -21,7 +21,7 @@ func init() {
 	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
-			data, err := txt2img.RenderToBase64(b.BookReview, 40, 20)
+			data, err := txt2img.RenderToBase64(b.BookReview, txt2img.FontFile, 400, 20)
 			if err != nil {
 				log.Println("err:", err)
 			}
@@ -33,7 +33,7 @@ func init() {
 	engine.OnFullMatch("随机书评").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			br := getRandomBookReview()
-			data, err := txt2img.RenderToBase64(br.BookReview, 40, 20)
+			data, err := txt2img.RenderToBase64(br.BookReview, txt2img.FontFile, 400, 20)
 			if err != nil {
 				log.Println("err:", err)
 			}

plugin_danbooru/main.go

@@ -0,0 +1,57 @@
+// Package deepdanbooru 二次元图片标签识别
+package deepdanbooru
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"os"
+
+	"github.com/FloatTech/AnimeAPI/danbooru"
+	"github.com/FloatTech/AnimeAPI/picture"
+	"github.com/FloatTech/AnimeAPI/saucenao"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/file"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+)
+
+const cachefile = "data/danbooru/"
+
+func init() { // 插件主体
+	_ = os.RemoveAll(cachefile)
+	err := os.MkdirAll(cachefile, 0755)
+	if err != nil {
+		panic(err)
+	}
+	engine := control.Register("danbooru", &control.Options{
+		DisableOnDefault: false,
+		Help: "二次元图片标签识别\n" +
+			"- 鉴赏图片[图片]",
+	})
+	// 上传一张图进行评价
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, picture.CmdMatch, picture.MustGiven).SetBlock(true).SetPriority(23).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			for _, url := range ctx.State["image_url"].([]string) {
+				name := ""
+				r, err := saucenao.SauceNAO(url)
+				if err != nil {
+					name = "未知图片"
+				} else {
+					name = r.Title
+				}
+				t, err := danbooru.TagURL(name, url)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				digest := md5.Sum(helper.StringToBytes(url))
+				f := cachefile + hex.EncodeToString(digest[:])
+				if file.IsNotExist(f) {
+					t.Canvas.SavePNG(f)
+				}
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + f))
+			}
+		})
+}

plugin_fortune/fortune.go

@@ -3,19 +3,16 @@ package fortune
 
 import (
 	"archive/zip"
-	"bytes"
-	"encoding/base64"
+	"crypto/md5"
+	"encoding/hex"
 	"encoding/json"
-	"image/jpeg"
-	"io"
-	"io/ioutil"
+	"image"
 	"math/rand"
 	"os"
 	"strconv"
-	"sync"
 	"time"
 
-	"github.com/fogleman/gg"
+	"github.com/fogleman/gg" // 注册了 jpg png gif
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -24,27 +21,50 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/txt2img"
 )
 
 var (
 	// 底图缓存位置
-	base = "data/fortune/"
-	// 素材下载网站
-	site = "https://pan.dihe.moe/fortune/"
+	images = "data/Fortune/"
+	// 基础文件位置
+	omikujson = "data/Fortune/text.json"
+	// 字体文件位置
+	font = "data/Font/sakura.ttf"
+	// 生成图缓存位置
+	cache = images + "cache/"
 	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
 	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师
 	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
-	// 下载锁
-	dlmu sync.Mutex
+	// 签文
+	omikujis []map[string]string
 )
 
 func init() {
 	for i, s := range table {
 		index[s] = uint8(i)
 	}
-	err := os.MkdirAll(base, 0755)
+	err := os.MkdirAll(images, 0755)
+	if err != nil {
+		panic(err)
+	}
+	err = os.MkdirAll(cache, 0755)
+	if err != nil {
+		panic(err)
+	}
+	process.SleepAbout1sTo2s()
+	data, err := file.GetLazyData(omikujson, true, false)
+	if err != nil {
+		panic(err)
+	}
+	err = json.Unmarshal(data, &omikujis)
+	if err != nil {
+		panic(err)
+	}
+	_, err = file.GetLazyData(font, false, true)
 	if err != nil {
 		panic(err)
 	}
@@ -81,38 +101,6 @@ func init() {
 		})
 	en.OnFullMatchGroup([]string{"运势", "抽签"}).SetBlock(true).SecondPriority().
 		Handle(func(ctx *zero.Ctx) {
-			// 检查签文文件是否存在
-			mikuji := base + "运势签文.json"
-			if file.IsNotExist(mikuji) {
-				dlmu.Lock()
-				if file.IsNotExist(mikuji) {
-					ctx.SendChain(message.Text("正在下载签文文件，请稍后..."))
-					err := file.DownloadTo(site+"运势签文.json", mikuji, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						dlmu.Unlock()
-						return
-					}
-					ctx.SendChain(message.Text("下载签文文件完毕"))
-				}
-				dlmu.Unlock()
-			}
-			// 检查字体文件是否存在
-			ttf := base + "sakura.ttf"
-			if file.IsNotExist(ttf) {
-				dlmu.Lock()
-				if file.IsNotExist(ttf) {
-					ctx.SendChain(message.Text("正在下载字体文件，请稍后..."))
-					err := file.DownloadTo(site+"sakura.ttf", ttf, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						dlmu.Unlock()
-						return
-					}
-					ctx.SendChain(message.Text("下载字体文件完毕"))
-				}
-				dlmu.Unlock()
-			}
 			// 获取该群背景类型，默认车万
 			kind := "车万"
 			gid := ctx.Event.GroupID
@@ -129,127 +117,90 @@ func init() {
 				}
 			}
 			// 检查背景图片是否存在
-			folder := base + kind
-			if file.IsNotExist(folder) {
-				dlmu.Lock()
-				if file.IsNotExist(folder) {
-					ctx.SendChain(message.Text("正在下载背景图片，请稍后..."))
-					zipfile := kind + ".zip"
-					zipcache := base + zipfile
-					err := file.DownloadTo(site+zipfile, zipcache, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						dlmu.Unlock()
-						return
-					}
-					ctx.SendChain(message.Text("下载背景图片完毕"))
-					err = unpack(zipcache, folder+"/")
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						dlmu.Unlock()
-						return
-					}
-					ctx.SendChain(message.Text("解压背景图片完毕"))
-					// 释放空间
-					os.Remove(zipcache)
-				}
-				dlmu.Unlock()
+			zipfile := images + kind + ".zip"
+			_, err = file.GetLazyData(zipfile, false, false)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
+
 			// 生成种子
 			t, _ := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
 			seed := ctx.Event.UserID + t
+
 			// 随机获取背景
-			background, err := randimage(folder+"/", seed)
+			background, index, err := randimage(zipfile, seed)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
+
 			// 随机获取签文
-			title, text, err := randtext(mikuji, seed)
+			title, text, err := randtext(seed)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			// 绘制背景
-			d, err := draw(background, title, text)
+
+			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
+			cachefile := cache + hex.EncodeToString(digest[:])
+
+			var data []byte
+			switch file.IsExist(cachefile) {
+			case true:
+				data, err = os.ReadFile(cachefile)
+				if err == nil {
+					break
+				}
+				_ = os.Remove(cachefile)
+				fallthrough
+			case false:
+				// 绘制背景
+				data, err = draw(background, title, text)
+			}
+
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
+			_ = os.WriteFile(cachefile, data, 0644)
 			// 发送图片
-			ctx.SendChain(message.Image("base64://" + helper.BytesToString(d)))
+			ctx.SendChain(message.Image("base64://" + helper.BytesToString(data)))
 		})
 }
 
-// @function unpack 解压资源包
-// @param tgt 压缩文件位置
-// @param dest 解压位置
-// @return 错误信息
-func unpack(tgt, dest string) error {
-	// 路径目录不存在则创建目录
-	if file.IsNotExist(dest) {
-		if err := os.MkdirAll(dest, 0755); err != nil {
-			panic(err)
-		}
-	}
-	reader, err := zip.OpenReader(tgt)
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-	// 遍历解压到文件
-	for _, file := range reader.File {
-		// 打开解压文件
-		rc, err := file.Open()
-		if err != nil {
-			return err
-		}
-		// 打开目标文件
-		w, err := os.OpenFile(dest+file.Name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
-		if err != nil {
-			rc.Close()
-			return err
-		}
-		// 复制到文件
-		_, err = io.Copy(w, rc)
-		rc.Close()
-		w.Close()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// @function randimage 随机选取文件夹下的文件
-// @param path 文件夹路径
+// @function randimage 随机选取zip内的文件
+// @param path zip路径
 // @param seed 随机数种子
 // @return 文件路径 & 错误信息
-func randimage(path string, seed int64) (string, error) {
-	rd, err := ioutil.ReadDir(path)
+func randimage(path string, seed int64) (im image.Image, index int, err error) {
+	reader, err := zip.OpenReader(path)
 	if err != nil {
-		return "", err
+		return
 	}
+	defer reader.Close()
+
 	rand.Seed(seed)
-	return path + rd[rand.Intn(len(rd))].Name(), nil
+	index = rand.Intn(len(reader.File))
+	file := reader.File[index]
+	f, err := file.Open()
+	if err != nil {
+		return
+	}
+	defer f.Close()
+
+	im, _, err = image.Decode(f)
+	return
 }
 
 // @function randtext 随机选取签文
 // @param file 文件路径
 // @param seed 随机数种子
 // @return 签名 & 签文 & 错误信息
-func randtext(file string, seed int64) (string, string, error) {
-	data, err := ioutil.ReadFile(file)
-	if err != nil {
-		return "", "", err
-	}
-	temp := []map[string]string{}
-	if err := json.Unmarshal(data, &temp); err != nil {
-		return "", "", err
-	}
+func randtext(seed int64) (string, string, error) {
 	rand.Seed(seed)
-	r := rand.Intn(len(temp))
-	return temp[r]["title"], temp[r]["content"], nil
+	r := rand.Intn(len(omikujis))
+	return omikujis[r]["title"], omikujis[r]["content"], nil
 }
 
 // @function draw 绘制运势图
@@ -258,24 +209,19 @@ func randtext(file string, seed int64) (string, string, error) {
 // @param title 签名
 // @param text 签文
 // @return 错误信息
-func draw(background, title, text string) ([]byte, error) {
-	// 加载背景
-	back, err := gg.LoadImage(background)
-	if err != nil {
-		return nil, err
-	}
+func draw(back image.Image, title, text string) ([]byte, error) {
 	canvas := gg.NewContext(back.Bounds().Size().Y, back.Bounds().Size().X)
 	canvas.DrawImage(back, 0, 0)
 	// 写标题
 	canvas.SetRGB(1, 1, 1)
-	if err := canvas.LoadFontFace(base+"sakura.ttf", 45); err != nil {
+	if err := canvas.LoadFontFace(font, 45); err != nil {
 		return nil, err
 	}
 	sw, _ := canvas.MeasureString(title)
 	canvas.DrawString(title, 140-sw/2, 112)
 	// 写正文
 	canvas.SetRGB(0, 0, 0)
-	if err := canvas.LoadFontFace(base+"sakura.ttf", 23); err != nil {
+	if err := canvas.LoadFontFace(font, 23); err != nil {
 		return nil, err
 	}
 	tw, th := canvas.MeasureString("测")
@@ -304,17 +250,7 @@ func draw(background, title, text string) ([]byte, error) {
 			}
 		}
 	}
-	// 转成 base64
-	buffer := new(bytes.Buffer)
-	encoder := base64.NewEncoder(base64.StdEncoding, buffer)
-	var opt jpeg.Options
-	opt.Quality = 70
-	err = jpeg.Encode(encoder, canvas.Image(), &opt)
-	if err != nil {
-		return nil, err
-	}
-	encoder.Close()
-	return buffer.Bytes(), nil
+	return txt2img.TxtCanvas{Canvas: canvas}.ToBase64()
 }
 
 func offest(total, now int, distance float64) float64 {

plugin_nativesetu/data.go

@@ -3,7 +3,6 @@ package nativesetu
 import (
 	"bytes"
 	"image"
-	"io"
 	"io/fs"
 	"os"
 	"sync"
@@ -11,7 +10,7 @@ import (
 	"github.com/corona10/goimagehash"
 	"github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-	"golang.org/x/image/webp"
+	_ "golang.org/x/image/webp"
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
@@ -105,10 +104,6 @@ func scanclass(root fs.FS, path, clsn string) error {
 			}
 			b := bytes.NewReader(f)
 			img, _, e := image.Decode(b)
-			if e != nil {
-				b.Seek(0, io.SeekStart)
-				img, e = webp.Decode(b)
-			}
 			if e != nil {
 				return e
 			}

plugin_novel/qianbi.go

@@ -86,7 +86,7 @@ func init() {
 						downloadURL := websiteURL + "/modules/article/txtarticle.php?id=" + id
 						text += fmt.Sprintf("书名:%s\n类型:%s\n作者:%s\n状态:%s\n字数:%s\n简介:%s\n更新时间:%s\n最新章节:%s\n网页链接:%s\n下载地址:%s\n\n", bookName, category, author, status, wordNumbers, description, updateTime, latestChapter, webpageURL, downloadURL)
 					}
-					data, err := txt2img.RenderToBase64(text, 40, 20)
+					data, err := txt2img.RenderToBase64(text, txt2img.FontFile, 400, 20)
 					if err != nil {
 						log.Println("err:", err)
 					}
@@ -118,7 +118,7 @@ func init() {
 				webpageURL := websiteURL + "/book/" + id + "/"
 				downloadURL := websiteURL + "/modules/article/txtarticle.php?id=" + id
 				text := fmt.Sprintf("书名:%s\n类型:%s\n作者:%s\n状态:%s\n简介:%s\n更新时间:%s\n最新章节:%s\n网页链接:%s\n下载地址:%s\n", bookName, category, author, status, description, updateTime, latestChapter, webpageURL, downloadURL)
-				data, err := txt2img.RenderToBase64(text, 40, 20)
+				data, err := txt2img.RenderToBase64(text, txt2img.FontFile, 400, 20)
 				if err != nil {
 					log.Println("err:", err)
 				}

plugin_omikuji/sensou.go

@@ -40,7 +40,7 @@ func init() { // 插件主体
 		})
 	engine.OnFullMatchGroup([]string{"解签"}).SetPriority(10).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			kujiBytes, err := txt2img.RenderToBase64(getKujiByBango(bangoToday(ctx.Event.UserID)), 40, 20)
+			kujiBytes, err := txt2img.RenderToBase64(getKujiByBango(bangoToday(ctx.Event.UserID)), txt2img.FontFile, 400, 20)
 			if err != nil {
 				log.Errorln("[omikuji]:", err)
 			}

plugin_score/data.go

@@ -5,7 +5,9 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/txt2img"
 )
 
 const (
@@ -21,6 +23,14 @@ var sdb *scoredb
 func init() {
 	go func() {
 		process.SleepAbout1sTo2s()
+		_, err := file.GetLazyData(txt2img.BoldFontFile, false, true)
+		if err != nil {
+			panic(err)
+		}
+		_, err = file.GetLazyData(txt2img.FontFile, false, true)
+		if err != nil {
+			panic(err)
+		}
 		_ = os.MkdirAll(dbpath, 0755)
 		os.RemoveAll(cachePath)
 		_ = os.MkdirAll(cachePath, 0755)

plugin_score/sign_in.go

@@ -116,7 +116,7 @@ func init() {
 			canvas.Fill()
 			canvas.DrawString(fmt.Sprintf("%d/%d", score, nextLevelScore), float64(back.Bounds().Size().X)*0.75, float64(back.Bounds().Size().Y)*1.62)
 
-			f, err := os.Open(drawedFile)
+			f, err := os.Create(drawedFile)
 			txtc := txt2img.TxtCanvas{Canvas: canvas}
 			if err != nil {
 				log.Errorln("[score]", err)
@@ -129,6 +129,7 @@ func init() {
 				return
 			}
 			_, err = txtc.WriteTo(f)
+			_ = f.Close()
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return

plugin_shindan/shindan.go

@@ -52,7 +52,7 @@ func handle(ctx *zero.Ctx) {
 	// TODO: 可注入
 	switch ctx.State["id"].(int64) {
 	case 587874, 162207:
-		data, err := txt2img.RenderToBase64(text, 40, 20)
+		data, err := txt2img.RenderToBase64(text, txt2img.FontFile, 400, 20)
 		if err != nil {
 			log.Errorln("[shindan]:", err)
 		}

plugin_vtb_quotation/vtb_quotation.go

@@ -47,7 +47,7 @@ func init() {
 			}
 			defer db.Close()
 			defer cancel()
-			firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), 40, 20)
+			firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), txt2img.FontFile, 400, 20)
 			if err != nil {
 				log.Errorln("[vtb]:", err)
 			}
@@ -79,7 +79,7 @@ func init() {
 							// log.Println(secondStepMessage)
 							if secondStepMessage == "" {
 								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), 40, 20)
+								firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), txt2img.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
@@ -88,7 +88,7 @@ func init() {
 								}
 								errorCount++
 							} else {
-								secondStepMessageBytes, err := txt2img.RenderToBase64(secondStepMessage, 40, 20)
+								secondStepMessageBytes, err := txt2img.RenderToBase64(secondStepMessage, txt2img.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
@@ -110,7 +110,7 @@ func init() {
 							// log.Println(thirdStepMessage)
 							if thirdStepMessage == "" {
 								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								secondStepMessageBytes, err := txt2img.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), 40, 20)
+								secondStepMessageBytes, err := txt2img.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), txt2img.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
@@ -119,7 +119,7 @@ func init() {
 								}
 								errorCount++
 							} else {
-								thirdStepMessageBytes, err := txt2img.RenderToBase64(thirdStepMessage, 40, 20)
+								thirdStepMessageBytes, err := txt2img.RenderToBase64(thirdStepMessage, txt2img.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
@@ -142,7 +142,7 @@ func init() {
 							recURL := tc.ThirdCategoryPath
 							if recURL == "" {
 								ctx.SendChain(message.Reply(e.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), 40, 20)
+								firstStepImageBytes, err := txt2img.RenderToBase64(db.GetAllFirstCategoryMessage(), txt2img.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}