fix:升级依赖

go.mod

@@ -19,7 +19,8 @@ require (
 )
 
 require (
-	github.com/FloatTech/AnimeAPI v1.7.0
+	github.com/Andrew-M-C/go.emoji v1.1.2
+	github.com/FloatTech/AnimeAPI v1.7.1-0.20240826120833-9bf54389aadb
 	github.com/FloatTech/floatbox v0.0.0-20240505082030-226ec6713e14
 	github.com/FloatTech/gg v1.1.3
 	github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9
@@ -29,7 +30,6 @@ require (
 	github.com/antchfx/htmlquery v1.2.5
 	github.com/chromedp/chromedp v0.10.0
 	github.com/disintegration/imaging v1.6.2
-	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4
 	github.com/fumiama/cron v1.3.0
 	github.com/fumiama/go-registry v0.2.7
 	github.com/gin-gonic/gin v1.10.0
@@ -50,7 +50,6 @@ require (
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
 	golang.org/x/time v0.6.0
 	google.golang.org/api v0.194.0
-	google.golang.org/protobuf v1.34.2
 	gorm.io/driver/mysql v1.5.7
 )
 
@@ -61,7 +60,6 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	cloud.google.com/go/longrunning v0.5.7 // indirect
-	github.com/Andrew-M-C/go.emoji v1.1.2 // indirect
 	github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 // indirect
 	github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 // indirect
 	github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 // indirect
@@ -78,13 +76,13 @@ require (
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fumiama/go-base16384 v1.7.0 // indirect
 	github.com/fumiama/go-simple-protobuf v0.2.0 // indirect
 	github.com/fumiama/gofastTEA v0.0.10 // indirect
 	github.com/fumiama/imgsz v0.0.2 // indirect
-	github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565 // indirect
 	github.com/fumiama/terasu v0.0.0-20240502091919-c887e26289a8 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
@@ -150,6 +148,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
 	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

go.sum

@@ -53,8 +53,8 @@ github.com/Andrew-M-C/go.emoji v1.1.2 h1:aEnNbkv+t6H7vXNgT3YztwgGyeDC1Bh3uLXBCcv
 github.com/Andrew-M-C/go.emoji v1.1.2/go.mod h1:qd7MnWAtZF/eu/BxyU3UojQJ96puZMtVre9TL1IOz8E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/FloatTech/AnimeAPI v1.7.0 h1:CX1bTjHbVZTYlvppzrWFyLzIFzRVrIDxJmtbWo/Ew6Y=
-github.com/FloatTech/AnimeAPI v1.7.0/go.mod h1:6vYu7bW5gPQsBnXB+I6yk+eJQaaAwusoQ/I/wQMwOAI=
+github.com/FloatTech/AnimeAPI v1.7.1-0.20240826120833-9bf54389aadb h1:j7m84zwcDWLoMLjgG4MDnvanGQoDNnG8A7/aNCnYMIk=
+github.com/FloatTech/AnimeAPI v1.7.1-0.20240826120833-9bf54389aadb/go.mod h1:Ru6q5pZUnfMg1iu0M1Hp73q9N3LNIbDr16kjkzyG6Xk=
 github.com/FloatTech/floatbox v0.0.0-20240505082030-226ec6713e14 h1:8O0Iq9MnKsKowltY9txhOqcJdmGTjxHPQ4gEYzbJc9A=
 github.com/FloatTech/floatbox v0.0.0-20240505082030-226ec6713e14/go.mod h1:OzGLhvmtz1TKIdGaJDd8pQumvD36UqK+dWsiCISmzQQ=
 github.com/FloatTech/gg v1.1.3 h1:+GlL02lTKsxJQr4WCuNwVxC1/eBZrCvypCIBtxuOFb4=
@@ -157,8 +157,6 @@ github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoG
 github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
 github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
-github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565 h1:sQuR2+N5HurnvsZhiKdEg+Ig354TaqgCQRxd/0KgIOQ=
-github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565/go.mod h1:UUEvyLTJ7yoOA/viKG4wEis4ERydM7+Ny6gZUWgkS80=
 github.com/fumiama/terasu v0.0.0-20240502091919-c887e26289a8 h1:mVOgOhlrF0ra8/BkwVA71ev/1HkzAgDn8gWU2UNbDU8=
 github.com/fumiama/terasu v0.0.0-20240502091919-c887e26289a8/go.mod h1:UVx8YP1jKKL1Cj+uy+OnQRM2Ih6U36Mqy9GSf7jabsI=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
@@ -277,6 +275,7 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s=
 github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -327,6 +326,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -433,8 +433,10 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
 github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
 github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=

main.go

@@ -60,18 +60,19 @@ func main() {
 			ctx.SendChain(message.Text("发送lssv , 插件列表 或 服务列表 查看 bot 开放插件\n发送\"帮助 插件\"查看插件帮助"))
 		})
 
+	zero.Run(&config.Config.Z)
+
 	if web.On {
 		go func() {
 			r := web.GetWebEngine()
 			r.Run("127.0.0.1:8888")
 		}()
 	}
-	zero.Run(&config.Config.Z)
 
 	// 优雅关闭
 	// 创建一个 channel 用于监听退出信号
 	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 	// 等待接收到退出信号
 	<-quit
 	log.Info().Str("name", "main").Msg("Shutting down server...")

plugin/bilibili/bilibili.go

@@ -329,12 +329,12 @@ func init() {
 		faceH := float64(510)
 
 		totalDanmuku := 0
-		for i := 0; i < len(danmaku.Data.Data); i++ {
-			totalDanmuku += len(danmaku.Data.Data[i].Danmakus) + 1
+		for i := 0; i < len(danmaku.Data.Data.Records); i++ {
+			totalDanmuku += len(danmaku.Data.Data.Records[i].Danmakus) + 1
 		}
 		cw := 3000
 		mcw := float64(2000)
-		ch := 550 + len(danmaku.Data.Data)*int(faceH) + totalDanmuku*int(danmuH)
+		ch := 550 + len(danmaku.Data.Data.Records)*int(faceH) + totalDanmuku*int(danmuH)
 		canvas = gg.NewContext(cw, ch)
 		canvas.SetColor(color.White)
 		canvas.Clear()
@@ -364,9 +364,9 @@ func init() {
 		canvas.DrawString("网页链接: "+fmt.Sprintf(bz.DanmakuURL, u.Mid), startWidth, 422.5)
 		var channelStart float64
 		channelStart = float64(550)
-		for i := 0; i < len(danmaku.Data.Data); i++ {
-			item := danmaku.Data.Data[i]
-			facePath = cachePath + strconv.FormatInt(item.Channel.UID, 10) + "vupFace" + path.Ext(item.Channel.FaceURL)
+		for i := 0; i < len(danmaku.Data.Data.Records); i++ {
+			item := danmaku.Data.Data.Records[i]
+			facePath = cachePath + strconv.Itoa(item.Channel.UID) + "vupFace" + path.Ext(item.Channel.FaceURL)
 			if path.Ext(item.Channel.FaceURL) != ".webp" {
 				err = initFacePic(facePath, item.Channel.FaceURL)
 				if err != nil {
@@ -385,7 +385,7 @@ func init() {
 			}
 			canvas.SetRGB255(24, 144, 255)
 			canvas.DrawString("标题: "+item.Live.Title, startWidth, channelStart+fontH)
-			canvas.DrawString("主播: "+item.Channel.Name, startWidth, channelStart+fontH*2)
+			canvas.DrawString("主播: "+item.Channel.UName, startWidth, channelStart+fontH*2)
 			canvas.SetColor(color.Black)
 			canvas.DrawString("开始时间: "+time.UnixMilli(item.Live.StartDate).Format("2006-01-02 15:04:05"), startWidth, channelStart+fontH*3)
 			if item.Live.IsFinish {
@@ -403,8 +403,8 @@ func init() {
 
 				canvas.DrawString("直播时长: "+strconv.FormatFloat(float64(time.Now().UnixMilli()-item.Live.StartDate)/3600000.0, 'f', 1, 64)+"小时", startWidth, channelStart+fontH*5)
 			}
-			canvas.DrawString("弹幕数量: "+strconv.FormatInt(item.Live.DanmakusCount, 10), startWidth, channelStart+fontH*6)
-			canvas.DrawString("观看次数: "+strconv.FormatInt(item.Live.WatchCount, 10), startWidth, channelStart+fontH*7)
+			canvas.DrawString("弹幕数量: "+strconv.Itoa(item.Live.DanmakusCount), startWidth, channelStart+fontH*6)
+			canvas.DrawString("观看次数: "+strconv.Itoa(item.Live.WatchCount), startWidth, channelStart+fontH*7)
 
 			t := "收益:"
 			l, _ := canvas.MeasureString(t)
@@ -426,7 +426,7 @@ func init() {
 				canvas.DrawString(t, moveW, danmuNow)
 				moveW += l + dz
 
-				t = danItem.Name
+				t = danItem.UName
 				l, _ = canvas.MeasureString(t)
 				canvas.SetRGB255(24, 144, 255)
 				canvas.DrawString(t, moveW, danmuNow)

plugin/bilibili/bilibili_parse.go

@@ -2,13 +2,17 @@
 package bilibili
 
 import (
+	"encoding/json"
+	"fmt"
+	"net/http"
 	"regexp"
 
 	zero "ZeroBot"
 
 	"ZeroBot/message"
 
 	bz "github.com/FloatTech/AnimeAPI/bilibili"
+	"github.com/FloatTech/floatbox/web"
 )
 
 var (
@@ -71,7 +75,7 @@ func handleVideo(ctx *zero.Ctx) {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
-	summaryMsg, err := getVideoSummary(card)
+	summaryMsg, err := getVideoSummary(cfg, card)
 	if err != nil {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
@@ -106,3 +110,38 @@ func handleLive(ctx *zero.Ctx) {
 	}
 	ctx.SendChain(liveCard2msg(card)...)
 }
+
+// getVideoSummary AI视频总结
+func getVideoSummary(cookiecfg *bz.CookieConfig, card bz.Card) (msg []message.MessageSegment, err error) {
+	var (
+		data         []byte
+		videoSummary bz.VideoSummary
+	)
+	data, err = web.RequestDataWithHeaders(web.NewDefaultClient(), bz.SignURL(fmt.Sprintf(bz.VideoSummaryURL, card.BvID, card.CID, card.Owner.Mid)), "GET", func(req *http.Request) error {
+		if cookiecfg != nil {
+			cookie := ""
+			cookie, err = cookiecfg.Load()
+			if err != nil {
+				return err
+			}
+			req.Header.Add("cookie", cookie)
+		}
+		req.Header.Set("User-Agent", ua)
+		return nil
+	}, nil)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(data, &videoSummary)
+	msg = make([]message.MessageSegment, 0, 16)
+	msg = append(msg, message.Text("已为你生成视频总结\n\n"))
+	msg = append(msg, message.Text(videoSummary.Data.ModelResult.Summary, "\n\n"))
+	for _, v := range videoSummary.Data.ModelResult.Outline {
+		msg = append(msg, message.Text("● ", v.Title, "\n"))
+		for _, p := range v.PartOutline {
+			msg = append(msg, message.Text(fmt.Sprintf("%d:%d %s\n", p.Timestamp/60, p.Timestamp%60, p.Content)))
+		}
+		msg = append(msg, message.Text("\n"))
+	}
+	return
+}

plugin/bilibili/card2msg.go

@@ -3,13 +3,11 @@ package bilibili
 import (
 	"MiniBot/utils"
 	"encoding/json"
-	"fmt"
 	"time"
 
 	"ZeroBot/message"
 
 	bz "github.com/FloatTech/AnimeAPI/bilibili"
-	"github.com/FloatTech/floatbox/web"
 )
 
 var (
@@ -327,27 +325,3 @@ func videoCard2msg(card bz.Card) (msg []message.MessageSegment, err error) {
 		bz.VURL, card.BvID, "\n\n"))
 	return
 }
-
-// getVideoSummary AI视频总结
-func getVideoSummary(card bz.Card) (msg []message.MessageSegment, err error) {
-	var (
-		data         []byte
-		videoSummary bz.VideoSummary
-	)
-	data, err = web.GetData(bz.SignURL(fmt.Sprintf(bz.VideoSummaryURL, card.BvID, card.CID)))
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(data, &videoSummary)
-	msg = make([]message.MessageSegment, 0, 16)
-	msg = append(msg, message.Text("已为你生成视频总结\n\n"))
-	msg = append(msg, message.Text(videoSummary.Data.ModelResult.Summary, "\n\n"))
-	for _, v := range videoSummary.Data.ModelResult.Outline {
-		msg = append(msg, message.Text("● ", v.Title, "\n"))
-		for _, p := range v.PartOutline {
-			msg = append(msg, message.Text(fmt.Sprintf("%d:%d %s\n", p.Timestamp/60, p.Timestamp%60, p.Content)))
-		}
-		msg = append(msg, message.Text("\n"))
-	}
-	return
-}

plugin/bilibili/card2msg_test.go

@@ -51,7 +51,7 @@ func TestGetVideoSummary(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(getVideoSummary(card))
+	t.Log(getVideoSummary(cfg, card))
 }
 
 func TestLiveRoomInfo(t *testing.T) {

plugin/dnf/service/yxdr.go

@@ -66,7 +66,7 @@ func Screenshot(server string, productType string) ([]byte, string, error) {
 	err := chromedp.Run(Ctx,
 		chromedp.Navigate(url),
 		chromedp.WaitVisible("#right_m"),
-		chromedp.FullScreenshot(&buf, 100),
+		chromedp.FullScreenshot(&buf, 90),
 	)
 	if err != nil {
 		return nil, url, err

plugin/fortune/fortune.go

@@ -5,7 +5,6 @@ import (
 	"MiniBot/utils"
 	"MiniBot/utils/cache"
 	database "MiniBot/utils/db"
-	"MiniBot/utils/imgfactory"
 	"MiniBot/utils/path"
 	"archive/zip"
 	"context"
@@ -21,6 +20,8 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/FloatTech/imgfactory"
+
 	zero "ZeroBot"
 
 	"ZeroBot/message"

plugin/qqwife/favor_cmd.go

@@ -11,7 +11,8 @@ import (
 
 	"MiniBot/service/wallet"
 	"MiniBot/utils/cache"
-	"MiniBot/utils/imgfactory"
+
+	"github.com/FloatTech/imgfactory"
 
 	"github.com/FloatTech/gg"
 )

plugin/score/draw.go

@@ -13,9 +13,10 @@ import (
 	"time"
 
 	"MiniBot/utils/cache"
-	"MiniBot/utils/imgfactory"
 	"MiniBot/utils/text"
 
+	"github.com/FloatTech/imgfactory"
+
 	"github.com/FloatTech/gg"
 	"github.com/FloatTech/rendercard"
 	"github.com/disintegration/imaging"