优化代码结构

plugin/coser/coser.go

@@ -2,7 +2,10 @@
 package coser
 
 import (
-	"regexp"
+	"errors"
+	"math/rand"
+	"os"
+	"time"
 
 	"github.com/tidwall/gjson"
 
@@ -10,6 +13,8 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/AnimeAPI/setu"
+	"github.com/FloatTech/floatbox/file"
 	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
@@ -19,35 +24,44 @@ import (
 var (
 	ua       = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36"
 	coserURL = "http://ovooa.com/API/cosplay/api.php"
-	datestr  = regexp.MustCompile(`/\d{4}-\d{2}-\d{2}/`)
 )
 
 func init() {
+	p, err := setu.NewPool(setu.DefaultPoolDir,
+		func(s string) (string, error) {
+			if s != "coser" {
+				return "", errors.New("invalid call")
+			}
+			typ := setu.DefaultPoolDir + "/" + "coser"
+			if file.IsNotExist(typ) {
+				err := os.MkdirAll(typ, 0755)
+				if err != nil {
+					return "", err
+				}
+			}
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
+			if err != nil {
+				return "", err
+			}
+			arr := gjson.Get(helper.BytesToString(data), "data.data").Array()
+			pic := arr[rand.Intn(len(arr))]
+			return pic.String(), nil
+		}, web.GetData, time.Minute)
+	if err != nil {
+		panic(err)
+	}
 	control.Register("coser", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "三次元coser",
 		Help:             "- coser",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser").SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text("少女祈祷中......"))
-			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
+			pic, err := p.Roll("coser")
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
-			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
-			ds := ""
-			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
-				if ds == "" {
-					ds = datestr.FindString(value.String())
-				} else if ds != datestr.FindString(value.String()) {
-					return false
-				}
-				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
-				return true
-			})
-			if id := ctx.Send(m).ID(); id == 0 {
+			if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic))}).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})

plugin/epidemic/epidemic.go

@@ -1,120 +0,0 @@
-// Package epidemic 城市疫情查询
-package epidemic
-
-import (
-	"encoding/json"
-
-	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"
-)
-
-const txurl = "https://api.inews.qq.com/newsqa/v1/query/inner/publish/modules/list?modules=statisGradeCityDetail,diseaseh5Shelf"
-
-// result 疫情查询结果
-type result struct {
-	Data struct {
-		Epidemic epidemic `json:"diseaseh5Shelf"`
-	} `json:"data"`
-}
-
-// epidemic 疫情数据
-type epidemic struct {
-	LastUpdateTime string  `json:"lastUpdateTime"`
-	AreaTree       []*area `json:"areaTree"`
-}
-
-// area 城市疫情数据
-type area struct {
-	Name  string `json:"name"`
-	Today struct {
-		Confirm int `json:"confirm"`
-		Wzzadd  any `json:"wzz_add"`
-	} `json:"today"`
-	Total struct {
-		NowConfirm int    `json:"nowConfirm"`
-		Confirm    int    `json:"confirm"`
-		Dead       int    `json:"dead"`
-		Heal       int    `json:"heal"`
-		Grade      string `json:"grade"`
-		Wzz        int    `json:"wzz"`
-	} `json:"total"`
-	Children []*area `json:"children"`
-}
-
-func init() {
-	engine := control.Register("epidemic", &ctrl.Options[*zero.Ctx]{
-		DisableOnDefault: false,
-		Brief:            "城市疫情查询",
-		Help:             "- xxx疫情\n",
-	})
-	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
-		Handle(func(ctx *zero.Ctx) {
-			city := ctx.State["args"].(string)
-			if city == "" {
-				ctx.SendChain(message.Text("你还没有输入城市名字呢！"))
-				return
-			}
-			data, time, err := queryEpidemic(city)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			if data == nil {
-				ctx.SendChain(message.Text("没有找到【", city, "】城市的疫情数据."))
-				return
-			}
-			ctx.SendChain(
-				message.Text(
-					"【", data.Name, "】疫情数据\n",
-					"新增人数：", data.Today.Confirm, "\n",
-					"现有确诊：", data.Total.NowConfirm, "\n",
-					"累计确诊：", data.Total.Confirm, "\n",
-					"治愈人数：", data.Total.Heal, "\n",
-					"死亡人数：", data.Total.Dead, "\n",
-					"无症状人数：", data.Total.Wzz, "\n",
-					"新增无症状：", data.Today.Wzzadd, "\n",
-					"更新时间：\n『", time, "』",
-				),
-			)
-		})
-}
-
-// rcity 查找城市
-func rcity(a *area, cityName string) *area {
-	if a == nil {
-		return nil
-	}
-	if a.Name == cityName {
-		return a
-	}
-	for _, v := range a.Children {
-		if v.Name == cityName {
-			return v
-		}
-		c := rcity(v, cityName)
-		if c != nil {
-			return c
-		}
-	}
-	return nil
-}
-
-// queryEpidemic 查询城市疫情
-func queryEpidemic(findCityName string) (citydata *area, times string, err error) {
-	data, err := web.GetData(txurl)
-	if err != nil {
-		return
-	}
-	var r result
-	err = json.Unmarshal(data, &r)
-	if err != nil {
-		return
-	}
-	citydata = rcity(r.Data.Epidemic.AreaTree[0], findCityName)
-	return citydata, r.Data.Epidemic.LastUpdateTime, nil
-}

plugin/fortune/fortune.go

@@ -40,7 +40,7 @@ const (
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋", "ASoul"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典", "夏日口袋", "ASoul", "Hololive"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -53,7 +53,7 @@ func init() {
 		DisableOnDefault: false,
 		Brief:            "每日运势",
 		Help: "- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典 | 夏日口袋 | ASoul | Hololive]",
 		PublicDataFolder: "Fortune",
 	})
 	_ = os.RemoveAll(cache)

plugin/heisi/heisi.go

@@ -2,11 +2,17 @@
 package heisi
 
 import (
+	"errors"
 	"math/rand"
+	"os"
 	"strconv"
+	"time"
 	"unsafe"
 
+	"github.com/FloatTech/AnimeAPI/setu"
 	fbctxext "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"
@@ -25,6 +31,39 @@ var (
 )
 
 func init() { // 插件主体
+	p, err := setu.NewPool(setu.DefaultPoolDir,
+		func(s string) (string, error) {
+			if s != "黑丝" && s != "白丝" && s != "jk" && s != "巨乳" && s != "足控" && s != "网红" {
+				return "", errors.New("invalid call")
+			}
+			typ := setu.DefaultPoolDir + "/" + s
+			if file.IsNotExist(typ) {
+				err := os.MkdirAll(typ, 0755)
+				if err != nil {
+					return "", err
+				}
+			}
+			var pic item
+			switch s {
+			case "黑丝":
+				pic = heisiPic[rand.Intn(len(heisiPic))]
+			case "白丝":
+				pic = baisiPic[rand.Intn(len(baisiPic))]
+			case "jk":
+				pic = jkPic[rand.Intn(len(jkPic))]
+			case "巨乳":
+				pic = jurPic[rand.Intn(len(jurPic))]
+			case "足控":
+				pic = zukPic[rand.Intn(len(zukPic))]
+			case "网红":
+				pic = mcnPic[rand.Intn(len(mcnPic))]
+			}
+			return pic.String(), nil
+		}, web.GetData, time.Minute)
+	if err != nil {
+		panic(err)
+	}
+
 	engine := control.Register("heisi", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "黑丝",
@@ -65,22 +104,12 @@ func init() { // 插件主体
 	})).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			matched := ctx.State["matched"].(string)
-			var pic item
-			switch matched {
-			case "来点黑丝":
-				pic = heisiPic[rand.Intn(len(heisiPic))]
-			case "来点白丝":
-				pic = baisiPic[rand.Intn(len(baisiPic))]
-			case "来点jk":
-				pic = jkPic[rand.Intn(len(jkPic))]
-			case "来点巨乳":
-				pic = jurPic[rand.Intn(len(jurPic))]
-			case "来点足控":
-				pic = zukPic[rand.Intn(len(zukPic))]
-			case "来点网红":
-				pic = mcnPic[rand.Intn(len(mcnPic))]
+			pic, err := p.Roll(matched[3*2:])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
-			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic.String()))}
+			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic))}
 			if id := ctx.Send(m).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}