🐛 ✨ ⚡️ 🔥 ascii2d返回多结果&修复合并转发

* 优化在两个命令中使用空格分隔的体验
- fortune的设置底图功能
- b14的加密功能

* 优化四个插件中使用空格分隔的体验
- 加密
- 哔哩哔哩推送
- 藏头诗
- 运势

* 优化并修正了上一个commit
- 加上了因为复制粘贴疏忽又没有注意测试遗漏的`?`
- 调整藏头诗和加密的正则触发，使其不必多此一举
- 删去了未被发现的测试代码

* - 删去了遗漏的Trim

* 优化了更多插件中使用空格的体验
- 优化了music bilibili image_finder 中使用空格的体验
- 补上了plugin_bilibili中未实现的vup开头触发
- 为plugin_bilibili_parse输出的消息加上一个换行符，优化排版

README.md

@@ -58,6 +58,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态)
     - [x] /禁止 service qq1 qq2... (禁止 qqs 使用服务 service)
     - [x] /允许 service qq1 qq2... (重新允许 qqs 使用服务 service)
+    - [x] /封禁 qq1 qq2... (禁止 qqs 使用全部服务)
+    - [x] /解封 qq1 qq2... (允许 qqs 使用全部服务)
     - [x] /用法 xxx
     - [x] /服务列表
     - [x] /服务详情
@@ -165,6 +167,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 评价图片(发送一张图片让bot评分)
 - **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru`
     - [x] 鉴赏图片[图片]
+- **叔叔的AI二次元图片放大** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"`
+    - [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.5-beta2
-	github.com/FloatTech/zbputils v1.2.5-beta1
+	github.com/FloatTech/AnimeAPI v1.2.5-beta10
+	github.com/FloatTech/zbputils v1.2.5-beta7
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
@@ -19,7 +19,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.21.12
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.13.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220127075442-eb7b296fc97e
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220207114459-068919ac2b02
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 )
 

go.sum

@@ -1,8 +1,8 @@
-github.com/FloatTech/AnimeAPI v1.2.5-beta2 h1:O8PGLzLLQNGNtJoq+gkpvkEe2JdaZ3vP9pD4+0ASPPk=
-github.com/FloatTech/AnimeAPI v1.2.5-beta2/go.mod h1:tWU3xDvkSqnFD8SCTS5oko1UhkVlrNLK6PmN0ea6n6Q=
+github.com/FloatTech/AnimeAPI v1.2.5-beta10 h1:C4gvZ4VbVjNUA8WBgNnq0ra0YG1uNyL8VmHGFdpZ1Tc=
+github.com/FloatTech/AnimeAPI v1.2.5-beta10/go.mod h1:QXGkLikmx2G4nVL24RwLdfcA8Hd54SdfCqVqu/Znd5A=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/zbputils v1.2.5-beta1 h1:wptmjPpsaoK77igPKFmdUB86AWPyNyuEtT7LNYt2t4U=
-github.com/FloatTech/zbputils v1.2.5-beta1/go.mod h1:1VE4gxnrr+uRz/TDPgx3GT8GmVayoF5e0wolBQU3t+k=
+github.com/FloatTech/zbputils v1.2.5-beta7 h1:5mgJaYa8fTx/PQp+oL13pJGQ6GEjkUDg1r1T2ECAiac=
+github.com/FloatTech/zbputils v1.2.5-beta7/go.mod h1:3XY4b7OJuQD2zUOaBc1EzDdpXvx3YM4FvpUKZNwgreA=
 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=
@@ -166,8 +166,8 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
 github.com/wdvxdr1123/ZeroBot v1.3.2/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
 github.com/wdvxdr1123/ZeroBot v1.4.1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220127075442-eb7b296fc97e h1:0LG8ZvBHtRyPY68G9keReiOtPqsNFoRLBoYO27BUfMA=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220127075442-eb7b296fc97e/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220207114459-068919ac2b02 h1:Tm5gEjJpm0M2sY6RegimsrRekqNBD26qZjYwTx5Gt6s=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220207114459-068919ac2b02/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=

main.go

@@ -69,6 +69,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"    // 本地老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nsfw"          // nsfw图片识别
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"      // 以图搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"         // 叔叔的AI二次元图片放大
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"      // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"      // 搜番
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation" // vtb语录
@@ -79,6 +80,8 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
 	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 var (
@@ -156,6 +159,7 @@ func getKanban() string {
 }
 
 func main() {
+	order.Wait()
 	printBanner()
 	// 帮助
 	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).

order/init.go

@@ -0,0 +1,14 @@
+package order
+
+import "sync"
+
+var wg sync.WaitGroup
+
+// DoneOnExit 在退出时执行 Done
+func DoneOnExit() func() {
+	wg.Add(1)
+	return wg.Done
+}
+
+// Wait 等待
+var Wait = wg.Wait

order/prio.go

@@ -44,6 +44,7 @@ const (
 	PrioReborn
 	PrioRuncode
 	PrioSauceNao
+	PrioScale
 	PrioScore
 	PrioSetuTime
 	PrioShaDiao

plugin_acgimage/classify.go

@@ -89,7 +89,7 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {

plugin_bilibili/info.go

@@ -22,7 +22,7 @@ var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{
 
 // 查成分的
 func init() {
-	engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true).
+	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			rest, err := uid(keyword)

plugin_bilibili_parse/bilibili_parse.go

@@ -57,7 +57,7 @@ func parseURL(bilibiliURL string) (m message.Message) {
 	m = append(m, message.Image(image))
 	like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data
 	coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data
-	m = append(m, message.Text("点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
+	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
 	collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data
 	share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data
 	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"分享：", strings.TrimSpace(share)+"\n"))

plugin_bilibili_push/data.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/FloatTech/zbputils/process"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -19,6 +21,7 @@ var bdb *bilibilipushdb
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		os.RemoveAll(cachePath)

plugin_book_review/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const dbpath = "data/BookReview/"
@@ -18,6 +20,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_chat/data.go

@@ -8,12 +8,15 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type kimo = map[string]*[]string
 
 func initChatList(postinit func()) {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		data, err := file.GetLazyData(dbfile, true, true)

plugin_chouxianghua/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -20,6 +22,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_coser/coser.go

@@ -48,12 +48,13 @@ func init() {
 					text,
 				))
 			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
-				imgcq := `[CQ:image,file=` + value.String() + `]`
 				m = append(m,
 					message.CustomNode(
 						ctx.Event.Sender.NickName,
 						ctx.Event.UserID,
-						imgcq),
+						[]message.MessageSegment{
+							message.Image(value.String()),
+						}),
 				)
 				return true
 			})

plugin_cpstory/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -20,6 +22,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_curse/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -22,6 +24,7 @@ var (
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, err := file.GetLazyData(dbfile, false, true)

plugin_danbooru/main.go

@@ -32,7 +32,7 @@ func init() { // 插件主体
 			"- 鉴赏图片[图片]",
 	})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
@@ -41,7 +41,7 @@ func init() { // 插件主体
 				if err != nil {
 					name = "未知图片"
 				} else {
-					name = r.Title
+					name = r[0].Title
 				}
 				t, err := danbooru.TagURL(name, url)
 				if err != nil {

plugin_diana/data/text.go

@@ -12,6 +12,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -28,6 +30,7 @@ type text struct {
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {

plugin_fortune/fortune.go

@@ -42,7 +42,7 @@ const (
 
 var (
 	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
-	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师
+	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘
 	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘"}
 	// 映射底图与 index
 	index = make(map[string]uint8)

plugin_funny/data.go

@@ -7,6 +7,8 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type joke struct {
@@ -22,6 +24,7 @@ const (
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, err := file.GetLazyData(dbfile, false, true)

plugin_hs/run.go

@@ -71,7 +71,6 @@ func init() {
 		for i := 0; i < t && i < 5; i++ {
 			cid := gjson.Get(g, `list.`+strconv.Itoa(i)+`.CardID`).String()
 			cachefile := cachedir + cid
-			imgcq := `[CQ:image,file=` + "file:///" + cachefile + `]`
 			if file.IsNotExist(cachefile) {
 				data, err := web.ReqWith(
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
@@ -81,7 +80,7 @@ func init() {
 					err = os.WriteFile(cachefile, data, 0644)
 				}
 				if err != nil {
-					imgcq = err.Error()
+					continue
 				}
 			}
 			sk = append(
@@ -89,7 +88,7 @@ func init() {
 				message.CustomNode(
 					zero.BotConfig.NickName[0],
 					ctx.Event.SelfID,
-					imgcq, // 图片
+					[]message.MessageSegment{message.Image("file:///" + cachefile)}, // 图片
 				),
 			)
 		}

plugin_image_finder/keyword.go

@@ -69,7 +69,7 @@ func init() {
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
-	}).OnRegex(`^来张 (.*)$`, zero.AdminPermission).SetBlock(true).
+	}).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson := soutuapi(keyword)

plugin_manager/manager.go

@@ -68,6 +68,7 @@ var engine = control.Register("manager", order.PrioManager, &control.Options{
 
 func init() { // 插件主体
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(datapath, 0755)
 		clock = timer.NewClock(db)

plugin_music/selecter.go

@@ -30,7 +30,7 @@ func init() {
 			"- 网易点歌[xxx]\n" +
 			"- 酷我点歌[xxx]\n" +
 			"- 酷狗点歌[xxx]",
-	}).OnRegex("^(.{0,2})点歌(.{1,25})$").SetBlock(true).
+	}).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
 				ctx.SendChain(message.Text("请稍后重试0x0..."))

plugin_nativesetu/data.go

@@ -16,6 +16,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 // setuclass holds setus in a folder, which is the class name.
@@ -29,6 +31,7 @@ var ns = &nsetu{db: &sql.Sqlite{DBPath: dbfile}}
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {

plugin_nsfw/main.go

@@ -1,9 +1,11 @@
+// Package nsfw 图片合规性审查
 package nsfw
 
 import (
 	"github.com/FloatTech/AnimeAPI/nsfw"
 	"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"
 
@@ -16,7 +18,7 @@ func init() {
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -37,10 +39,12 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
+				process.SleepAbout1sTo2s()
 				p, err := nsfw.Classify(url...)
 				if err != nil {
 					return
 				}
+				process.SleepAbout1sTo2s()
 				autojudge(ctx, p[0])
 			}
 		})
@@ -51,7 +55,7 @@ func judge(p nsfw.Picture) string {
 		return "普通哦"
 	}
 	c := ""
-	if p.Drawings > 0.3 {
+	if p.Drawings > 0.3 || p.Neutral < 0.3 {
 		c = "二次元"
 	} else {
 		c = "三次元"

plugin_omikuji/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -19,11 +21,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 
 func init() {
 	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				log.Println(err)
-			}
-		}()
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, _ = file.GetLazyData(dbfile, false, true)

plugin_reborn/load.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -27,6 +29,7 @@ var (
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {

plugin_saucenao/searcher.go

@@ -97,7 +97,7 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
@@ -109,34 +109,55 @@ func init() { // 插件主体
 					// 返回SauceNAO的结果
 					ctx.SendChain(
 						message.Text("我有把握是这个！"),
-						message.Image(result.Thumbnail),
+						message.Image(result[0].Thumbnail),
 						message.Text(
 							"\n",
-							"相似度：", result.Similarity, "\n",
-							"标题：", result.Title, "\n",
-							"插画ID：", result.PixivID, "\n",
-							"画师：", result.MemberName, "\n",
-							"画师ID：", result.MemberID, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result.PixivID,
+							"相似度：", result[0].Similarity, "\n",
+							"标题：", result[0].Title, "\n",
+							"插画ID：", result[0].PixivID, "\n",
+							"画师：", result[0].MemberName, "\n",
+							"画师ID：", result[0].MemberID, "\n",
+							"直链：", "https://pixivel.moe/detail?id=", result[0].PixivID,
 						),
 					)
 					continue
 				}
 				if result, err := ascii2d.Ascii2d(pic); err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
-				} else {
-					// 返回Ascii2d的结果
-					ctx.SendChain(
-						message.Text(
-							"大概是这个？", "\n",
-							"标题：", result.Title, "\n",
-							"插画ID：", result.Pid, "\n",
-							"画师：", result.UserName, "\n",
-							"画师ID：", result.UserId, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result.Pid,
-						),
-					)
 					continue
+				} else {
+					var msg message.Message = []message.MessageSegment{
+						message.CustomNode(
+							ctx.Event.Sender.Name(),
+							ctx.Event.UserID,
+							"ascii2d搜图结果",
+						)}
+					for i := 0; i < len(result) && i < 5; i++ {
+						msg = append(
+							msg,
+							message.CustomNode(
+								ctx.Event.Sender.Name(),
+								ctx.Event.UserID,
+								[]message.MessageSegment{
+									message.Image(result[i].Thumb),
+									message.Text(fmt.Sprintf(
+										"标题：%s\n图源：%s\n画师：%s\n画师链接：%s\n图片链接：%s",
+										result[i].Name,
+										result[i].Type,
+										result[i].AuthNm,
+										result[i].Author,
+										result[i].Link,
+									)),
+								},
+							),
+						)
+					}
+					if id := ctx.SendGroupForwardMessage(
+						ctx.Event.GroupID,
+						msg,
+					).Get("message_id").Int(); id == 0 {
+						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+					}
 				}
 			}
 		})

plugin_scale/main.go

@@ -0,0 +1,104 @@
+// Package scale 叔叔的AI二次元图片放大
+package scale
+
+import (
+	"os"
+	"strconv"
+	"time"
+
+	"github.com/FloatTech/AnimeAPI/nsfw"
+	"github.com/FloatTech/AnimeAPI/scale"
+	"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"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const cachedir = "data/scale/"
+
+func init() {
+	_ = os.RemoveAll(cachedir)
+	err := os.MkdirAll(cachedir, 0755)
+	if err != nil {
+		panic(err)
+	}
+	engine := control.Register("scale", order.PrioScale, &control.Options{
+		DisableOnDefault: false,
+		Help:             "叔叔的AI二次元图片放大\n- 放大图片[图片]",
+	})
+	// 上传一张图进行评价
+	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven, getPara).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			url := ctx.State["image_url"].([]string)
+			if len(url) > 0 {
+				ctx.SendChain(message.Text("少女祈祷中..."))
+				p, err := nsfw.Classify(url[0])
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				if p[0].Drawings < 0.1 || p[0].Neutral > 0.8 {
+					ctx.SendChain(message.Text("请发送二次元图片!"))
+					return
+				}
+				paras := ctx.State["scale_paras"].([2]int)
+				data, err := scale.Get(url[0], paras[0], paras[1], 2)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				n := cachedir + strconv.Itoa(int(ctx.Event.UserID))
+				f, err := os.Create(n)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				_, _ = f.Write(data)
+				_ = f.Close()
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + n))
+			}
+		})
+}
+
+func getPara(ctx *zero.Ctx) bool {
+	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	recv, cancel := next.Repeat()
+	i := 0
+	paras := [2]int{}
+	ctx.SendChain(message.Text("请输入模型序号\n0.", scale.Models[0], "\n1.", scale.Models[1], "\n2.", scale.Models[2], "\n3.", scale.Models[3], "\n4.", scale.Models[4]))
+	for {
+		select {
+		case <-time.After(time.Second * 120):
+			return false
+		case e := <-recv:
+			msg := e.Message.ExtractPlainText()
+			num, err := strconv.Atoi(msg)
+			if err != nil {
+				ctx.SendChain(message.Text("请输入数字!"))
+				continue
+			}
+			switch i {
+			case 0:
+				if num < 0 || num > 4 {
+					ctx.SendChain(message.Text("模型序号非法!"))
+					continue
+				}
+				paras[0] = num
+				ctx.SendChain(message.Text("请输入放大倍数(2-4)"))
+			case 1:
+				if num < 2 || num > 4 {
+					ctx.SendChain(message.Text("放大倍数非法!"))
+					continue
+				}
+				cancel()
+				paras[1] = num
+				ctx.State["scale_paras"] = paras
+				return true
+			}
+			i++
+		}
+	}
+}

plugin_score/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/txt2img"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -22,6 +24,7 @@ var sdb *scoredb
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_, err := file.GetLazyData(txt2img.BoldFontFile, false, true)
 		if err != nil {

plugin_setutime/setu_geter.go

@@ -55,6 +55,7 @@ func init() { // 插件主体
 	_ = os.MkdirAll("data/SetuTime", 0755)
 
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// 如果数据库不存在则下载
 		_, _ = fileutil.GetLazyData(pool.db.DBPath, false, false)

plugin_sleep_manage/data.go

@@ -3,20 +3,15 @@ package sleepmanage
 import (
 	"os"
 
-	log "github.com/sirupsen/logrus"
-
 	"github.com/FloatTech/zbputils/process"
 
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model"
 )
 
 func init() {
 	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				log.Println(err)
-			}
-		}()
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		model.Initialize(dbfile)

plugin_vtb_quotation/cron.go

@@ -6,11 +6,13 @@ import (
 
 	"github.com/FloatTech/zbputils/process"
 
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model"
 )
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		log.Println("[vtb/cron] 开启vtb数据库日常更新")
 		vtbDaily()

plugin_vtb_quotation/data.go

@@ -5,11 +5,14 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, _ = file.GetLazyData(dbfile, false, false)