From 815bf416e3615bcf3b2f4e2067a90066da59312e Mon Sep 17 00:00:00 2001
From: Starrain08 <xingyu202205@126.com>
Date: Wed, 1 Jan 2025 08:52:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=85=BB?=
 =?UTF-8?q?=E7=8C=AB=E6=8F=92=E4=BB=B6=E5=9B=BE=E7=89=87=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/cybercat/catdata.go | 50 ++++++++++++++++++++++++++++++++------
 plugin/cybercat/keepcat.go |  3 ++-
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/plugin/cybercat/catdata.go b/plugin/cybercat/catdata.go
index 77e2d23..4ca0731 100644
--- a/plugin/cybercat/catdata.go
+++ b/plugin/cybercat/catdata.go
@@ -60,17 +60,51 @@ type catInfo struct {
 	Picurl    string  // 猫猫图片
 }
 
-func (inf *catInfo) avatar() string {
-	nti, err := pool.NewNTImage(inf.Picurl)
-	if err != nil {
-		return inf.Picurl
-	}
-	return nti.String()
+func (c *catInfo) avatar(Gid int64) string {
+    cache := "data/cybercat/cache" // 指定缓存路径
+	cache = path.Join(engine.DataFolder(), "cache")
+    imgname := fmt.Sprintf("%d_%d", c.User, Gid)
+    imgfile := filepath.Join(cache, c.Type+imgname+".png")
+    aimgfile := filepath.Join(file.BOTPATH, imgfile)
+
+	if _, err := os.Stat(cache); os.IsNotExist(err) {
+        err := os.MkdirAll(cache, 0755)
+        if err != nil {
+            fmt.Println("Error creating cache directory:", err)
+            return err.Error()
+        }
+    }
+    if file.IsNotExist(aimgfile) {
+        breed := c.Type
+        data, err := web.GetData(apiURL + "search?has_breeds=" + breed)
+        if err != nil {
+            fmt.Println("Error fetching avatar URL:", err)
+            return err.Error() // 返回错误信息
+        }
+        imgurl := gjson.ParseBytes(data).Get("0.url").String()
+        imgdata, err := web.GetData(imgurl)
+        if err != nil {
+            return "错误：未能解析图片URL"
+        }
+        var f *os.File
+        f, err = os.Create(aimgfile) // 使用 aimgfile 作为文件路径
+        if err != nil {
+            fmt.Println("Error creating file:", err)
+            return err.Error() // 返回错误信息
+        }
+        defer f.Close()
+        _, err = f.Write([]byte(imgdata)) // 写入图片数据
+        if err != nil {
+            fmt.Println("Error writing file:", err)
+            return err.Error() // 返回错误信息
+        }
+    }
+    return "file:///" + aimgfile // 返回文件协议的完整路径
 }
 
 var (
-	catdata = &catdb{
-		db: &sql.Sqlite{},
+	    dbpath = "data/cybercat/catdata.db"
+	    catdata = &catdb{db: sql.New(dbpath),
 	}
 	engine = control.Register("cybercat", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
diff --git a/plugin/cybercat/keepcat.go b/plugin/cybercat/keepcat.go
index 03e56fb..07b63ad 100644
--- a/plugin/cybercat/keepcat.go
+++ b/plugin/cybercat/keepcat.go
@@ -157,6 +157,7 @@ func init() {
 		userInfo.LastTime = time.Now().Unix()
 		userInfo.Mood += int(userInfo.Satiety)/5 - int(userInfo.Weight)/10
 		userInfo = userInfo.settleOfData()
+		avatarResult := userInfo.avatar(ctx.Event.GroupID) 
 		if err = catdata.insert(gidStr, &userInfo); err != nil {
 			ctx.SendChain(message.Text("[ERROR]:", err))
 			return
@@ -165,7 +166,7 @@ func init() {
 			stauts = "完全没有饱"
 		}
 		ctx.SendChain(message.Reply(id), message.Text(userInfo.Name, "当前信息如下:\n"),
-			message.Image(userInfo.avatar()),
+			message.Image(avatarResult),
 			message.Text("品种: "+userInfo.Type,
 				"\n饱食度: ", strconv.FormatFloat(userInfo.Satiety, 'f', 0, 64),
 				"\n心情: ", userInfo.Mood,

From 264b6f5b37df3b75e8a559630562988a53939a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Wed, 14 May 2025 22:05:44 +0900
Subject: [PATCH 2/2] trigger ci

---
 plugin/cybercat/catdata.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/cybercat/catdata.go b/plugin/cybercat/catdata.go
index 4ca0731..7e130fa 100644
--- a/plugin/cybercat/catdata.go
+++ b/plugin/cybercat/catdata.go
@@ -62,7 +62,7 @@ type catInfo struct {
 
 func (c *catInfo) avatar(Gid int64) string {
     cache := "data/cybercat/cache" // 指定缓存路径
-	cache = path.Join(engine.DataFolder(), "cache")
+    cache = path.Join(engine.DataFolder(), "cache")
     imgname := fmt.Sprintf("%d_%d", c.User, Gid)
     imgfile := filepath.Join(cache, c.Type+imgname+".png")
     aimgfile := filepath.Join(file.BOTPATH, imgfile)