Add files via upload

fix
FloatTech · Oct 20, 2024 · c6dcc9b · c6dcc9b
1 parent 8cd34b3
commit c6dcc9b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 36 deletions.
diff --git a/plugin/niuniu/draw.go b/plugin/niuniu/draw.go
@@ -12,7 +12,7 @@ import (
 
 type drawUserRanking struct {
 	name string
-	User *userInfo
+	user *userInfo
 }
 
 type drawer []drawUserRanking
@@ -34,7 +34,7 @@ func (allUsers drawer) draw(t bool) (img image.Image, err error) {
 	}
 	ri := make([]*rendercard.RankInfo, len(allUsers))
 	for i, user := range allUsers {
-		resp, err := http.Get(fmt.Sprintf("https://q1.qlogo.cn/g?b=qq&nk=%d&s=100", user.User.UID))
+		resp, err := http.Get(fmt.Sprintf("https://q1.qlogo.cn/g?b=qq&nk=%d&s=100", user.user.UID))
 		if err != nil {
 			return nil, err
 		}
@@ -46,8 +46,8 @@ func (allUsers drawer) draw(t bool) (img image.Image, err error) {
 		ri[i] = &rendercard.RankInfo{
 			Avatar:         decode,
 			TopLeftText:    user.name,
-			BottomLeftText: fmt.Sprintf("QQ:%d", user.User.UID),
-			RightText:      fmt.Sprintf("%s:%.2fcm", s, user.User.Length),
+			BottomLeftText: fmt.Sprintf("QQ:%d", user.user.UID),
+			RightText:      fmt.Sprintf("%s:%.2fcm", s, user.user.Length),
 		}
 	}
 	img, err = rendercard.DrawRankingCard(fontbyte, title, ri)

diff --git a/plugin/niuniu/main.go b/plugin/niuniu/main.go
@@ -2,9 +2,7 @@
 package niuniu
 
 import (
-	"bytes"
 	"fmt"
-	"image/png"
 	"strconv"
 	"strings"
 	"time"
@@ -210,25 +208,12 @@ func init() {
 			return
 		}
 		m.sort(true)
-		allUsers := make(drawer, len(m))
-		for i, info := range m {
-			allUsers[i] = drawUserRanking{
-				name: ctx.CardOrNickName(info.UID),
-				User: info,
-			}
-		}
-		ranking, err := allUsers.draw(true)
+		buf, err := m.setupDrawList(ctx, true)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
-		var buf bytes.Buffer
-		err = png.Encode(&buf, ranking)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.ImageBytes(buf.Bytes()))
+		ctx.SendChain(message.ImageBytes(buf))
 
 	})
 	en.OnFullMatch("牛子深度排行", zero.OnlyGroup, getdb).SetBlock(true).Handle(func(ctx *zero.Ctx) {
@@ -244,25 +229,13 @@ func init() {
 			return
 		}
 		m.sort(false)
-		allUsers := make(drawer, len(m))
-		for i, info := range m {
-			allUsers[i] = drawUserRanking{
-				name: ctx.CardOrNickName(info.UID),
-				User: info,
-			}
-		}
-		ranking, err := allUsers.draw(false)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		var buf bytes.Buffer
-		err = png.Encode(&buf, ranking)
+		buf, err := m.setupDrawList(ctx, false)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return
 		}
-		ctx.SendChain(message.ImageBytes(buf.Bytes()))
+
+		ctx.SendChain(message.ImageBytes(buf))
 	})
 	en.OnFullMatch("查看我的牛牛", getdb, zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		uid := ctx.Event.UserID

diff --git a/plugin/niuniu/model.go b/plugin/niuniu/model.go
@@ -2,8 +2,10 @@
 package niuniu
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
+	"image/png"
 	"math"
 	"math/rand"
 	"sort"
@@ -275,6 +277,23 @@ func (u *userInfo) purchaseItem(n int) (int, error) {
 	return money, err
 }
 
+func (m users) setupDrawList(ctx *zero.Ctx, t bool) ([]byte, error) {
+	allUsers := make(drawer, len(m))
+	for i, info := range m {
+		allUsers[i] = drawUserRanking{
+			name: ctx.CardOrNickName(info.UID),
+			user: info,
+		}
+	}
+	image, err := allUsers.draw(t)
+	if err != nil {
+		return nil, err
+	}
+	var buf bytes.Buffer
+	err = png.Encode(&buf, image)
+	return buf.Bytes(), err
+}
+
 func (m users) positive() users {
 	var m1 []*userInfo
 	for _, i2 := range m {