From 9b7faa13a0e72f854a5329402c9ed9eabd061c9c Mon Sep 17 00:00:00 2001
From: lixiangwuxian <mail@lxtend.com>
Date: Sun, 11 May 2025 02:28:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9C=A8=20LastDiffToImage=20?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=AD=E8=B0=83=E6=95=B4=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E9=AB=98=E5=BA=A6=E7=9A=84=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=9B=BE=E5=83=8F=E7=9A=84=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BB=A5=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E5=9B=BE=E5=83=8F=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/beatleader/model.go | 29 +++++++++++++++--------------
 service/scoresaber/model.go | 29 +++++++++++++++--------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/service/beatleader/model.go b/service/beatleader/model.go
index d294731..48abf82 100644
--- a/service/beatleader/model.go
+++ b/service/beatleader/model.go
@@ -514,20 +514,6 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string {
 
 	baseboard := sprite.NewNamedSpriteBoard()
 
-	avatar, err := util.ResizeImageByMaxHeight2Image(filePath, 214)
-	if err != nil {
-		log.Default().Printf("缩放头像失败，url:%s,err:%v", p.Avatar, err)
-	}
-	avatarSpirit := sprite.Sprite{
-		Name:  "avatar",
-		Image: avatar,
-		Index: 1,
-	}
-	if avatar == nil {
-		avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0))
-	}
-	baseboard.AddSprite(&avatarSpirit)
-
 	var sb strings.Builder
 	sb.WriteString(fmt.Sprintf("玩家 %s\n", p.Name))
 	sb.WriteString(fmt.Sprintf("区域 %s\n", p.Country))
@@ -584,6 +570,21 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string {
 	if err != nil {
 		log.Default().Printf("渲染文字失败，err:%v", err)
 	}
+
+	avatar, err := util.ResizeImageByMaxHeight2Image(filePath, uint(textImg.Bounds().Dy()))
+	if err != nil {
+		log.Default().Printf("缩放头像失败，url:%s,err:%v", p.Avatar, err)
+	}
+	avatarSpirit := sprite.Sprite{
+		Name:  "avatar",
+		Image: avatar,
+		Index: 1,
+	}
+	if avatar == nil {
+		avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0))
+	}
+	baseboard.AddSprite(&avatarSpirit)
+
 	textSpirit := sprite.Sprite{
 		Name:     "text",
 		Image:    textImg,
diff --git a/service/scoresaber/model.go b/service/scoresaber/model.go
index 40e25f7..2742e44 100644
--- a/service/scoresaber/model.go
+++ b/service/scoresaber/model.go
@@ -333,20 +333,6 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string {
 
 	baseboard := sprite.NewNamedSpriteBoard()
 
-	avatar, err := util.ResizeImageByMaxHeight2Image(filePath, 214)
-	if err != nil {
-		log.Default().Printf("缩放头像失败，url:%s,err:%v", p.ProfilePicture, err)
-	}
-	avatarSpirit := sprite.Sprite{
-		Name:  "avatar",
-		Image: avatar,
-		Index: 1,
-	}
-	if avatar == nil {
-		avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0))
-	}
-	baseboard.AddSprite(&avatarSpirit)
-
 	var sb strings.Builder
 	sb.WriteString(fmt.Sprintf("玩家 %s\n", p.Name))
 	sb.WriteString(fmt.Sprintf("区域 %s\n", p.Country))
@@ -403,6 +389,21 @@ func (p PlayerDataLite) LastDiffToImage(lastQueryData PlayerDataLite) string {
 	if err != nil {
 		log.Default().Printf("渲染文字失败，err:%v", err)
 	}
+
+	avatar, err := util.ResizeImageByMaxHeight2Image(filePath, uint(textImg.Bounds().Dy()))
+	if err != nil {
+		log.Default().Printf("缩放头像失败，url:%s,err:%v", p.ProfilePicture, err)
+	}
+	avatarSpirit := sprite.Sprite{
+		Name:  "avatar",
+		Image: avatar,
+		Index: 1,
+	}
+	if avatar == nil {
+		avatarSpirit.Image = image.NewRGBA(image.Rect(0, 0, 0, 0))
+	}
+	baseboard.AddSprite(&avatarSpirit)
+
 	textSpirit := sprite.Sprite{
 		Name:     "text",
 		Image:    textImg,