From e6b7826b486e548c4a38210813560be476fa19d2 Mon Sep 17 00:00:00 2001 From: Jiang-Red <79574799+Jiang-Red@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:11:06 +0000 Subject: [PATCH 1/5] new servicepic!!! --- control/rule.go | 87 +-------- control/servicepic.go | 403 +++++++++++++++++++++++------------------- img/text/font.go | 6 +- 3 files changed, 232 insertions(+), 264 deletions(-) diff --git a/control/rule.go b/control/rule.go index 17fe357..ad31e59 100644 --- a/control/rule.go +++ b/control/rule.go @@ -2,26 +2,18 @@ package control import ( - "encoding/base64" - "image" - "image/jpeg" "os" "strconv" "strings" - "sync" - "github.com/sirupsen/logrus" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/extension" "github.com/wdvxdr1123/ZeroBot/message" "github.com/FloatTech/floatbox/binary" - "github.com/FloatTech/floatbox/file" "github.com/FloatTech/imgfactory" "github.com/FloatTech/rendercard" ctrl "github.com/FloatTech/zbpctrl" - - "github.com/FloatTech/zbputils/ctxext" ) const ( @@ -30,7 +22,6 @@ const ( // Md5File ... Md5File = StorageFolder + "stor.spb" dbfile = StorageFolder + "plugins.db" - lnfile = StorageFolder + "lnperpg.txt" ) var ( @@ -79,21 +70,6 @@ func init() { if err != nil { panic(err) } - // 载入用户配置 - if file.IsExist(lnfile) { - data, err := os.ReadFile(lnfile) - if err != nil { - logrus.Warnln("[control] 读取配置文件失败,将使用默认的显示行数:", err) - } else { - mun, err := strconv.Atoi(binary.BytesToString(data)) - if err != nil { - logrus.Warnln("[control] 获取设置的服务列表显示行数错误,将使用默认的显示行数:", err) - } else if mun > 0 { - lnperpg = mun - logrus.Infoln("[control] 获取到当前设置的服务列表显示行数为:", lnperpg) - } - } - } zero.OnCommandGroup([]string{ "响应", "response", "沉默", "silence", }, zero.UserOrGrpAdmin, zero.OnlyToMe).SetBlock(true).SecondPriority().Handle(func(ctx *zero.Ctx) { @@ -474,65 +450,18 @@ func init() { if gid == 0 { gid = -ctx.Event.UserID } - var imgs []image.Image - imgs, err = drawservicesof(gid) + img, err := renderservepicof(gid) if err != nil { ctx.SendChain(message.Text("ERROR: ", err)) return } - if len(imgs) > 1 { - wg := sync.WaitGroup{} - msg := make(message.Message, len(imgs)) - wg.Add(len(imgs)) - for i := 0; i < len(imgs); i++ { - go func(i int) { - defer wg.Done() - msg[i] = ctxext.FakeSenderForwardNode(ctx, message.Image(binary.BytesToString(binary.NewWriterF(func(w *binary.Writer) { - w.WriteString("base64://") - encoder := base64.NewEncoder(base64.StdEncoding, w) - var opt jpeg.Options - opt.Quality = 70 - if err1 := jpeg.Encode(encoder, imgs[i], &opt); err1 != nil { - err = err1 - return - } - _ = encoder.Close() - })))) - }(i) - } - wg.Wait() - if id := ctx.Send(msg); id.ID() == 0 { - ctx.SendChain(message.Text("ERROR: 可能被风控了")) - } - } else { - b64, err := imgfactory.ToBase64(imgs[0]) - if err != nil { - ctx.SendChain(message.Text("ERROR: ", err)) - return - } - if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(b64))); id.ID() == 0 { - ctx.SendChain(message.Text("ERROR: 可能被风控了")) - } + b64, err := imgfactory.ToBase64(img) + if err != nil { + ctx.SendChain(message.Text("ERROR: ", err)) + return + } + if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(b64))); id.ID() == 0 { + ctx.SendChain(message.Text("ERROR: 可能被风控了")) } }) - - zero.OnCommand("设置服务列表显示行数", zero.SuperUserPermission, zero.OnlyToMe).SetBlock(true).SecondPriority().Handle(func(ctx *zero.Ctx) { - model := extension.CommandModel{} - _ = ctx.Parse(&model) - mun, err := strconv.Atoi(model.Args) - if err != nil { - ctx.SendChain(message.Text("请输入正确的数字")) - return - } - err = os.WriteFile(lnfile, binary.StringToBytes(model.Args), 0644) - if err != nil { - ctx.SendChain(message.Text(err)) - return - } - lnperpg = mun - // 清除缓存 - titlecache = nil - fullpageshadowcache = nil - ctx.SendChain(message.Text("已设置列表单页显示数为 " + strconv.Itoa(lnperpg))) - }) } diff --git a/control/servicepic.go b/control/servicepic.go index 02e6a1e..bd50e37 100644 --- a/control/servicepic.go +++ b/control/servicepic.go @@ -3,21 +3,14 @@ package control import ( "image" "os" - "runtime" - "strings" "sync" - "time" "github.com/FloatTech/floatbox/file" "github.com/FloatTech/floatbox/math" "github.com/FloatTech/gg" - "github.com/FloatTech/ttl" ctrl "github.com/FloatTech/zbpctrl" - "github.com/disintegration/imaging" zero "github.com/wdvxdr1123/ZeroBot" - "github.com/FloatTech/rendercard" - "github.com/FloatTech/zbputils/img/text" ) @@ -30,23 +23,18 @@ const ( type plugininfo struct { name string brief string - banner string status bool } var ( - // 标题缓存 - titlecache image.Image - // 卡片缓存 - cardcache = ttl.NewCache[uint64, image.Image](time.Hour * 12) - // 阴影缓存 - fullpageshadowcache image.Image - // lnperpg 每页行数 - lnperpg = 9 // 字体 GlowSans 数据 glowsd []byte // 字体 Impact 数据 impactd []byte + // 字体 Torus 数据 + torussd []byte + // 字体 Yuruka 数据 + yurukasd []byte ) func init() { @@ -58,6 +46,10 @@ func init() { if err != nil { panic(err) } + _, err = file.GetLazyData(kanbanpath+"zbpuwu.png", Md5File, false) + if err != nil { + panic(err) + } glowsd, err = file.GetLazyData(text.GlowSansFontFile, Md5File, true) if err != nil { panic(err) @@ -66,198 +58,241 @@ func init() { if err != nil { panic(err) } + torussd, err = file.GetLazyData(text.TorusFontFile, Md5File, true) + if err != nil { + panic(err) + } + yurukasd, err = file.GetLazyData(text.YurukaFontFile, Md5File, true) + if err != nil { + panic(err) + } } -func drawservicesof(gid int64) (imgs []image.Image, err error) { +func renderservepicof(gid int64) (img image.Image, err error) { pluginlist := make([]plugininfo, len(priomap)) ForEachByPrio(func(i int, manager *ctrl.Control[*zero.Ctx]) bool { pluginlist[i] = plugininfo{ name: manager.Service, brief: manager.Options.Brief, - banner: manager.Options.Banner, status: manager.IsEnabledIn(gid), } return true }) - // 分页 - if len(pluginlist) < lnperpg*3 { - // 如果单页显示数量超出了总数量 - lnperpg = math.Ceil(len(pluginlist), 3) + logo, err := gg.LoadImage(kanbanpath + "zbpuwu.png") + if err != nil { + return + } + serverlistlogo, err := renderserverlistlogo() + if err != nil { + return + } + max := len(pluginlist) + ln := math.Ceil(max, 3) + w := (290+24)*3 + 24 + h := serverlistlogo.Bounds().Dy() + ln*(80+16) + serverlistlogo.Bounds().Dy()/3 + canvas := gg.NewContext(w, h) + + canvas.SetRGBA255(235, 235, 235, 255) + canvas.Clear() + + canvas.SetRGBA255(135, 144, 173, 255) + canvas.NewSubPath() + canvas.MoveTo(0, 0) + canvas.LineTo(float64(canvas.W()), 140) + canvas.LineTo(float64(canvas.W()), 0) + canvas.ClosePath() + canvas.Fill() + + canvas.NewSubPath() + canvas.MoveTo(float64(canvas.W()), float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())-140) + canvas.ClosePath() + canvas.Fill() + + canvas.SetRGBA255(247, 177, 170, 255) + canvas.NewSubPath() + canvas.MoveTo(0, 0) + canvas.LineTo(float64(canvas.W()), 0) + canvas.LineTo(float64(canvas.W()), 70) + canvas.LineTo(0, 270) + canvas.ClosePath() + canvas.Fill() + + canvas.NewSubPath() + canvas.MoveTo(float64(canvas.W()), float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())-70) + canvas.LineTo(float64(canvas.W()), float64(canvas.H())-270) + canvas.ClosePath() + canvas.Fill() + + canvas.SetRGBA255(186, 113, 132, 255) + canvas.NewSubPath() + canvas.MoveTo(0, 0) + canvas.LineTo(float64(canvas.W()), 0) + canvas.LineTo(float64(canvas.W()), 35) + canvas.LineTo(0, 160) + canvas.ClosePath() + canvas.Fill() + + canvas.NewSubPath() + canvas.MoveTo(float64(canvas.W()), float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())) + canvas.LineTo(0, float64(canvas.H())-35) + canvas.LineTo(float64(canvas.W()), float64(canvas.H())-160) + canvas.ClosePath() + canvas.Fill() + + canvas.ScaleAbout(0.5, 0.5, float64(canvas.W()/4), 0) + canvas.DrawImageAnchored(logo, canvas.W()/4, 0, 0.5, 0) + canvas.Identity() + + canvas.DrawImageAnchored(serverlistlogo, canvas.W()/4*3, 0, 0.5, 0) + + cardimgs := make([]image.Image, 4) + + wg := sync.WaitGroup{} + cardsnum := math.Ceil(ln, 4) * 3 + wg.Add(4) + for i := 0; i < 3; i++ { + a := i * cardsnum + b := (i + 1) * cardsnum + go func(i int, list []plugininfo) { + defer wg.Done() + cardimgs[i], err = renderinfocards(list) + if err != nil { + return + } + }(i, pluginlist[a:b]) } - if titlecache == nil { - titlecache, err = (&rendercard.Title{ - Line: lnperpg, - LeftTitle: "服务列表", - LeftSubtitle: "service_list", - RightTitle: "FloatTech", - RightSubtitle: "ZeroBot-Plugin", - TitleFontData: glowsd, - TextFontData: impactd, - ImagePath: kanbanpath + "kanban.png", - }).DrawTitle() + go func() { + defer wg.Done() + cardimgs[3], err = renderinfocards(pluginlist[cardsnum*3:]) if err != nil { return } + }() + wg.Wait() + spacing := 0 + for i := 0; i < len(cardimgs); i++ { + canvas.DrawImage(cardimgs[i], 0, serverlistlogo.Bounds().Dy()+spacing) + spacing += cardimgs[i].Bounds().Dy() } - cardlist := make([]image.Image, len(pluginlist)) - n := runtime.NumCPU() - - if len(pluginlist) <= n { - for k, info := range pluginlist { - banner := "" - switch { - case strings.HasPrefix(info.banner, "http"): - err = file.DownloadTo(info.banner, bannerpath+info.name+".png") - if err != nil { - return - } - banner = bannerpath + info.name + ".png" - case info.banner != "": - banner = info.banner - default: - _, err = file.GetCustomLazyData(bannerurl, bannerpath+info.name+".png") - if err == nil { - banner = bannerpath + info.name + ".png" - } - } - c := &rendercard.Title{ - IsEnabled: info.status, - LeftTitle: info.name, - LeftSubtitle: info.brief, - ImagePath: banner, - TitleFontData: impactd, - TextFontData: glowsd, - } - h := c.Sum64() - card := cardcache.Get(h) - if card == nil { - card, err = c.DrawCard() - if err != nil { - return - } - cardcache.Set(h, card) - } - cardlist[k] = card - } - } else { - batchsize := len(pluginlist) / n - wg := sync.WaitGroup{} - drawcard := func(info []plugininfo, cards []image.Image) { - defer wg.Done() - for k, info := range info { - banner := "" - switch { - case strings.HasPrefix(info.banner, "http"): - err1 := file.DownloadTo(info.banner, bannerpath+info.name+".png") - if err1 != nil { - err = err1 - return - } - banner = bannerpath + info.name + ".png" - case info.banner != "": - banner = info.banner - default: - _, err1 := file.GetCustomLazyData(bannerurl, bannerpath+info.name+".png") - if err1 == nil { - banner = bannerpath + info.name + ".png" - } - } - c := &rendercard.Title{ - IsEnabled: info.status, - LeftTitle: info.name, - LeftSubtitle: info.brief, - ImagePath: banner, - TitleFontData: impactd, - TextFontData: glowsd, - } - h := c.Sum64() - card := cardcache.Get(h) - if card == nil { - var err1 error - card, err1 = c.DrawCard() - if err1 != nil { - err = err1 - return - } - card = rendercard.Fillet(card, 8) - cardcache.Set(h, card) - } - cards[k] = card - } + img = canvas.Image() + return +} + +func renderinfocards(plugininfos []plugininfo) (img image.Image, err error) { + w := (290+24)*3 + 24 + cardnum := len(plugininfos) + h := math.Ceil(cardnum, 3) * (80 + 16) + cardw, cardh := 290.0, 80.0 + spacingw, spacingh := 24.0, 16.0 + canvas := gg.NewContext(w, h) + beginw, beginh := 24.0, 0.0 + for i := 0; i < cardnum; i++ { + canvas.SetRGBA255(204, 51, 51, 255) + if plugininfos[i].status { + canvas.SetRGBA255(136, 178, 0, 255) } - wg.Add(n) - for i := 0; i < n; i++ { - a := i * batchsize - b := (i + 1) * batchsize - go drawcard(pluginlist[a:b], cardlist[a:b]) + canvas.DrawRoundedRectangle(beginw, beginh, cardw/2, cardh, 16) + canvas.Fill() + + canvas.SetRGBA255(34, 26, 33, 255) + canvas.DrawRoundedRectangle(beginw+10, beginh, cardw-10, cardh, 16) + canvas.Fill() + beginw += cardw + spacingw + if (i+1)%3 == 0 { + beginw = spacingw + beginh += cardh + spacingh } - if batchsize*n < len(pluginlist) { - wg.Add(1) - d := len(pluginlist) - batchsize*n - go drawcard(pluginlist[d:], cardlist[d:]) + } + + err = canvas.ParseFontFace(torussd, 36) + if err != nil { + return + } + canvas.SetRGBA255(235, 235, 235, 255) + beginw, beginh = 24.0, 0.0 + for i := 0; i < cardnum; i++ { + canvas.DrawStringAnchored(plugininfos[i].name, beginw+14, beginh+canvas.FontHeight()/2+4, 0, 0.5) + beginw += cardw + spacingw + if (i+1)%3 == 0 { + beginw = spacingw + beginh += cardh + spacingh } - wg.Wait() - if err != nil { - return + } + err = canvas.ParseFontFace(glowsd, 16) + if err != nil { + return + } + beginw, beginh = 24.0, 0.0 + for i := 0; i < cardnum; i++ { + canvas.DrawStringAnchored(plugininfos[i].brief, beginw+14, beginh+cardh-canvas.FontHeight()-4, 0, 0.5) + beginw += cardw + spacingw + if (i+1)%3 == 0 { + beginw = spacingw + beginh += cardh + spacingh } } + img = canvas.Image() + return +} - wg := sync.WaitGroup{} - cardnum := lnperpg * 3 - page := math.Ceil(len(pluginlist), cardnum) - imgs = make([]image.Image, page) - x, y := 30+2, 30+300+30+6+4 - if fullpageshadowcache == nil { - fullpageshadow := gg.NewContextForImage(rendercard.Transparency(titlecache, 0)) - fullpageshadow.SetRGBA255(0, 0, 0, 192) - for i := 0; i < cardnum; i++ { - fullpageshadow.DrawRoundedRectangle(float64(x), float64(y), 384-4, 256-4, 0) - fullpageshadow.Fill() - x += 384 + 30 - if (i+1)%3 == 0 { - x = 30 + 2 - y += 256 + 30 - } - } - fullpageshadowcache = imaging.Blur(fullpageshadow.Image(), 7) +func renderserverlistlogo() (img image.Image, err error) { + const w, h = 400, 200 + canvas := gg.NewContext(w, h) + canvas.SetRGBA255(187, 122, 132, 255) + err = canvas.ParseFontFace(yurukasd, 72) + if err != nil { + return } - wg.Add(page) - for l := 0; l < page; l++ { // 页数 - go func(l int, islast bool) { - defer wg.Done() - x, y := 30+2, 30+300+30+6+4 - var shadowimg image.Image - if islast && len(pluginlist)-cardnum*l < cardnum { - shadow := gg.NewContextForImage(rendercard.Transparency(titlecache, 0)) - shadow.SetRGBA255(0, 0, 0, 192) - for i := 0; i < len(pluginlist)-cardnum*l; i++ { - shadow.DrawRoundedRectangle(float64(x), float64(y), 384-4, 256-4, 0) - shadow.Fill() - x += 384 + 30 - if (i+1)%3 == 0 { - x = 30 + 2 - y += 256 + 30 - } - } - shadowimg = imaging.Blur(shadow.Image(), 7) - } else { - shadowimg = fullpageshadowcache - } - one := gg.NewContextForImage(titlecache) - x, y = 30, 30+300+30 - one.DrawImage(shadowimg, 0, 0) - for i := 0; i < math.Min(cardnum, len(pluginlist)-cardnum*l); i++ { - one.DrawImage(cardlist[(cardnum*l)+i], x, y) - x += 384 + 30 - if (i+1)%3 == 0 { - x = 30 - y += 256 + 30 - } - } - imgs[l] = one.Image() - }(l, l == page-1) + canvas.DrawStringAnchored("Server", 22, 45, 0, 1) + canvas.SetRGBA255(246, 166, 171, 255) + + canvas.DrawStringAnchored("List", 219, 112, 0, 1) + + canvas.SetRGBA255(135, 145, 173, 255) + err = canvas.ParseFontFace(yurukasd, 48) + if err != nil { + return } - wg.Wait() + canvas.DrawStringAnchored("服務列表", 23, 120, 0, 1) + + canvas.SetRGBA255(103, 178, 240, 255) + err = canvas.ParseFontFace(yurukasd, 36) + if err != nil { + return + } + + canvas.DrawStringAnchored("サーバー", 82, 25, 0, 1) + canvas.DrawStringAnchored("リスト", 280, 83, 0, 1) + + mask := canvas.AsMask() + + stroked := gg.NewContext(w, h) + stroked.SetMask(mask) + stroked.SetRGBA255(255, 255, 255, 255) + stroked.DrawRectangle(0, 0, float64(stroked.W()), float64(stroked.H())) + stroked.Fill() + + strokedimg := stroked.Image() + coloredimg := canvas.Image() + + canvas = gg.NewContext(w, h) + + canvas.DrawImage(strokedimg, -3, 0) + canvas.DrawImage(strokedimg, 3, 0) + canvas.DrawImage(strokedimg, 0, -3) + canvas.DrawImage(strokedimg, 0, 3) + canvas.DrawImage(strokedimg, -3, -3) + canvas.DrawImage(strokedimg, 3, 3) + canvas.DrawImage(strokedimg, 3, -3) + canvas.DrawImage(strokedimg, -3, 3) + canvas.DrawImage(coloredimg, 0, 0) + + img = canvas.Image() return } diff --git a/img/text/font.go b/img/text/font.go index 16e72df..f4b7f8a 100644 --- a/img/text/font.go +++ b/img/text/font.go @@ -34,5 +34,9 @@ const ( // GNUUnifontFontFile GNU Unifont https://unifoundry.com/unifont/index.html GNUUnifontFontFile = FontPath + "unifont-15.0.06.ttf" // AiralFontFile ... - AiralFontFile = FontPath + "arial.ttf" + ArialFontFile = FontPath + "arial.ttf" + // TorusFontFile ... + TorusFontFile = FontPath + "Torus-Regular.otf" + // YurukaFontFile ... + YurukaFontFile = FontPath + "FOT-Yuruka Std.ttf" ) From 5f0682f5758fdedc39a3349f66dbd7de9db2e324 Mon Sep 17 00:00:00 2001 From: Jiang-Red <79574799+Jiang-Red@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:23:17 +0000 Subject: [PATCH 2/5] make lint happy --- control/rule.go | 6 +++--- control/servicepic.go | 5 ++++- control/web/controller/manage.go | 2 +- go.mod | 8 ++++---- go.sum | 9 ++++----- img/pool/hook.go | 2 ++ img/pool/nt.go | 2 ++ img/text/font.go | 2 +- job/web.go | 2 +- 9 files changed, 22 insertions(+), 16 deletions(-) diff --git a/control/rule.go b/control/rule.go index ad31e59..299de56 100644 --- a/control/rule.go +++ b/control/rule.go @@ -167,7 +167,7 @@ func init() { } condition := strings.Contains(ctx.Event.RawMessage, "启用") || strings.Contains(ctx.Event.RawMessage, "enable") if condition { - managers.ForEach(func(key string, manager *ctrl.Control[*zero.Ctx]) bool { + managers.ForEach(func(_ string, manager *ctrl.Control[*zero.Ctx]) bool { if manager.Options.DisableOnDefault == condition { return true } @@ -176,7 +176,7 @@ func init() { }) ctx.SendChain(message.Text("此处启用所有插件成功")) } else { - managers.ForEach(func(key string, manager *ctrl.Control[*zero.Ctx]) bool { + managers.ForEach(func(_ string, manager *ctrl.Control[*zero.Ctx]) bool { manager.Disable(grp) return true }) @@ -234,7 +234,7 @@ func init() { argsparsed := make([]int64, 0, len(args)) var uid int64 var err error - haspermission := zero.GroupHigherPermission(func(ctx *zero.Ctx) int64 { return uid }) + haspermission := zero.GroupHigherPermission(func(_ *zero.Ctx) int64 { return uid }) for _, usr := range args[1:] { uid, err = strconv.ParseInt(usr, 10, 64) if err == nil && haspermission(ctx) { diff --git a/control/servicepic.go b/control/servicepic.go index bd50e37..0954d60 100644 --- a/control/servicepic.go +++ b/control/servicepic.go @@ -273,7 +273,10 @@ func renderserverlistlogo() (img image.Image, err error) { mask := canvas.AsMask() stroked := gg.NewContext(w, h) - stroked.SetMask(mask) + err = stroked.SetMask(mask) + if err != nil { + return + } stroked.SetRGBA255(255, 255, 255, 255) stroked.DrawRectangle(0, 0, float64(stroked.W()), float64(stroked.H())) stroked.Fill() diff --git a/control/web/controller/manage.go b/control/web/controller/manage.go index fcab5e9..4ce9a2c 100644 --- a/control/web/controller/manage.go +++ b/control/web/controller/manage.go @@ -38,7 +38,7 @@ var ( // 存储请求事件，flag作为键，一个request对象作为值 requestData syncx.Map[string, *zero.Event] upgrader = websocket.Upgrader{ - CheckOrigin: func(r *http.Request) bool { + CheckOrigin: func(_ *http.Request) bool { return true }, } diff --git a/go.mod b/go.mod index f9827aa..af5776c 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,13 @@ go 1.20 require ( github.com/FloatTech/ZeroBot-Plugin-Webui v1.0.1-0.20230412164529-cfe878675931 github.com/FloatTech/floatbox v0.0.0-20240505082030-226ec6713e14 - github.com/FloatTech/gg v1.1.2 + github.com/FloatTech/gg v1.1.3 github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9 github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 github.com/FloatTech/sqlite v1.6.3 - github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 github.com/FloatTech/zbpctrl v1.6.1 github.com/RomiChan/syncx v0.0.0-20240418144900-b7402ffdebc7 github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5 - github.com/disintegration/imaging v1.6.2 github.com/fumiama/cron v1.3.0 github.com/fumiama/go-base16384 v1.7.0 github.com/fumiama/go-registry v0.2.6 @@ -31,9 +29,11 @@ require ( ) require ( + github.com/FloatTech/ttl v0.0.0-20230307105452-d6f7b2b647d1 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/disintegration/imaging v1.6.2 // indirect github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect github.com/fumiama/go-simple-protobuf v0.1.0 // indirect github.com/fumiama/gofastTEA v0.0.10 // indirect @@ -62,7 +62,7 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/ugorji/go/codec v1.2.7 // indirect golang.org/x/crypto v0.22.0 // indirect - golang.org/x/image v0.3.0 // indirect + golang.org/x/image v0.15.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index 90e1c60..0f19309 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/FloatTech/ZeroBot-Plugin-Webui v1.0.1-0.20230412164529-cfe878675931 h github.com/FloatTech/ZeroBot-Plugin-Webui v1.0.1-0.20230412164529-cfe878675931/go.mod h1:Se2A9vnC4eSYF7vR2LNSayV7rvbFcpgVs1ZN4sEYMyg= 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.2 h1:YolgOYg3uDHc1+g0bLtt6QuRA/pvLn+b9IBCIhOOX88= -github.com/FloatTech/gg v1.1.2/go.mod h1:uzPzAeT35egARdRuu+1oyjU3CmTwCceoq3Vvje7LpcI= +github.com/FloatTech/gg v1.1.3 h1:+GlL02lTKsxJQr4WCuNwVxC1/eBZrCvypCIBtxuOFb4= +github.com/FloatTech/gg v1.1.3/go.mod h1:/9oLP54CMfq4r+71XL26uaFTJ1uL1boAyX67680/1HE= github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9 h1:IzZLuM/fgKclyMaU/Qb1qlLdGrs2FTietkqOWhh07Gw= github.com/FloatTech/imgfactory v0.2.2-0.20230315152233-49741fc994f9/go.mod h1:el5hGpj1C1bDRxcTXYRwEivDCr40zZeJpcrLrB1fajs= github.com/FloatTech/rendercard v0.0.10-0.20230223064326-45d29fa4ede9 h1:hffajvmQFfP68U6wUwHemPuuwCUoss+SEFfoLYwbGwE= @@ -184,8 +184,8 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg= -golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A= +golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= +golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= @@ -229,7 +229,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/img/pool/hook.go b/img/pool/hook.go index cf36123..b4db349 100644 --- a/img/pool/hook.go +++ b/img/pool/hook.go @@ -8,8 +8,10 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" ) +// NTImage ... type NTImage nturl +// NewNTImage ... func NewNTImage(u string) (nti NTImage, err error) { subs := ntcachere.FindStringSubmatch(u) if len(subs) != 3 { diff --git a/img/pool/nt.go b/img/pool/nt.go index 05f75e0..9d1d736 100644 --- a/img/pool/nt.go +++ b/img/pool/nt.go @@ -20,7 +20,9 @@ const ( var ntcachere = regexp.MustCompile(`^https://multimedia.nt.qq.com.cn/download\?appid=1407&fileid=([0-9a-zA-Z_-]+)&spec=0&rkey=([0-9a-zA-Z_-]+)$`) var ( + // ErrInvalidNTURL ... ErrInvalidNTURL = errors.New("invalid nt url") + // ErrInvalidNTRaw ... ErrInvalidNTRaw = errors.New("invalid nt raw") ) diff --git a/img/text/font.go b/img/text/font.go index f4b7f8a..b896f29 100644 --- a/img/text/font.go +++ b/img/text/font.go @@ -33,7 +33,7 @@ const ( QiantuXiaotuFontFile = FontPath + "QiantuXiaotuTi.ttf" // GNUUnifontFontFile GNU Unifont https://unifoundry.com/unifont/index.html GNUUnifontFontFile = FontPath + "unifont-15.0.06.ttf" - // AiralFontFile ... + // ArialFontFile ... ArialFontFile = FontPath + "arial.ttf" // TorusFontFile ... TorusFontFile = FontPath + "Torus-Regular.otf" diff --git a/job/web.go b/job/web.go index 0c37f5e..ab9ec6e 100644 --- a/job/web.go +++ b/job/web.go @@ -74,7 +74,7 @@ type Job struct { // List 任务列表 func List() (jobList []Job, err error) { jobList = make([]Job, 0, 16) - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(id int64, _ *zero.Ctx) bool { c := &cmd{} ids := strconv.FormatInt(id, 36) _ = db.FindFor(ids, c, "", func() error { From 715cff9f01b2311c90dac1bb90072f0eb03a92ac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:24:37 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=8E=A8=20=E6=94=B9=E8=BF=9B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- img/pool/img.go | 1 + 1 file changed, 1 insertion(+) diff --git a/img/pool/img.go b/img/pool/img.go index ade237b..5fd0cf4 100644 --- a/img/pool/img.go +++ b/img/pool/img.go @@ -15,6 +15,7 @@ import ( "github.com/wdvxdr1123/ZeroBot/message" "github.com/FloatTech/floatbox/web" + "github.com/FloatTech/zbputils/ctxext" ) From 5ec6f133bf9ab305ee028cbebcdcac1579d8efd0 Mon Sep 17 00:00:00 2001 From: Jiang-Red <79574799+Jiang-Red@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:30:02 +0000 Subject: [PATCH 4/5] make lint happy --- control/servicepic.go | 4 ++-- control/web/controller/manage.go | 20 ++++++++++---------- control/web/gui.go | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/control/servicepic.go b/control/servicepic.go index 0954d60..2e21c9b 100644 --- a/control/servicepic.go +++ b/control/servicepic.go @@ -86,8 +86,8 @@ func renderservepicof(gid int64) (img image.Image, err error) { if err != nil { return } - max := len(pluginlist) - ln := math.Ceil(max, 3) + listnum := len(pluginlist) + ln := math.Ceil(listnum, 3) w := (290+24)*3 + 24 h := serverlistlogo.Bounds().Dy() + ln*(80+16) + serverlistlogo.Bounds().Dy()/3 canvas := gg.NewContext(w, h) diff --git a/control/web/controller/manage.go b/control/web/controller/manage.go index 4ce9a2c..049a49a 100644 --- a/control/web/controller/manage.go +++ b/control/web/controller/manage.go @@ -86,7 +86,7 @@ type logWriter struct{} // @Success 200 {object} types.Response "成功" func GetBotList(context *gin.Context) { var bots []int64 - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(id int64, _ *zero.Ctx) bool { bots = append(bots, id) return true }) @@ -162,7 +162,7 @@ func GetGroupMemberList(context *gin.Context) { return } if d.SelfID == 0 { - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(_ int64, ctx *zero.Ctx) bool { bot = ctx return false }) @@ -244,7 +244,7 @@ func DeleteGroup(context *gin.Context) { return } if d.SelfID == 0 { - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(_ int64, ctx *zero.Ctx) bool { bot = ctx return false }) @@ -467,17 +467,17 @@ func UpdateAllPluginStatus(context *gin.Context) { } switch d.Status { case 0: - control.ForEachByPrio(func(i int, manager *ctrl.Control[*zero.Ctx]) bool { + control.ForEachByPrio(func(_ int, manager *ctrl.Control[*zero.Ctx]) bool { manager.Disable(d.GroupID) return true }) case 1: - control.ForEachByPrio(func(i int, manager *ctrl.Control[*zero.Ctx]) bool { + control.ForEachByPrio(func(_ int, manager *ctrl.Control[*zero.Ctx]) bool { manager.Enable(d.GroupID) return true }) case 2: - control.ForEachByPrio(func(i int, manager *ctrl.Control[*zero.Ctx]) bool { + control.ForEachByPrio(func(_ int, manager *ctrl.Control[*zero.Ctx]) bool { manager.Reset(d.GroupID) return true }) @@ -565,7 +565,7 @@ func GetRequestList(context *gin.Context) { return } var data []types.RequestVo - requestData.Range(func(key string, value *zero.Event) bool { + requestData.Range(func(_ string, value *zero.Event) bool { if d.SelfID != 0 && value.SelfID != d.SelfID { return true } @@ -641,7 +641,7 @@ func SendMsg(context *gin.Context) { } // 避免机器人之间发消息 botMap := make(map[int64]struct{}, 4) - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(id int64, _ *zero.Ctx) bool { botMap[id] = struct{}{} return true }) @@ -754,7 +754,7 @@ func GetUserInfo(context *gin.Context) { i, _ := middleware.LoginCache.Get(token) user := i.(*model.User) var qq int64 - if zero.BotConfig.SuperUsers != nil && len(zero.BotConfig.SuperUsers) > 0 { + if len(zero.BotConfig.SuperUsers) != 0 { qq = zero.BotConfig.SuperUsers[0] } r := types.UserInfoVo{ @@ -826,7 +826,7 @@ func getBot(context *gin.Context) (d types.BotParams, bot *zero.Ctx, err error) return } if d.SelfID == 0 { - zero.RangeBot(func(id int64, ctx *zero.Ctx) bool { + zero.RangeBot(func(_ int64, ctx *zero.Ctx) bool { bot = ctx return false }) diff --git a/control/web/gui.go b/control/web/gui.go index ee50dec..3a3a16e 100644 --- a/control/web/gui.go +++ b/control/web/gui.go @@ -35,7 +35,7 @@ func init() { return } ctx.SendChain(message.Text("设置成功")) - if zero.BotConfig.SuperUsers != nil && len(zero.BotConfig.SuperUsers) > 0 { + if len(zero.BotConfig.SuperUsers) != 0 { ctx.SendPrivateMessage(zero.BotConfig.SuperUsers[0], message.Text("webui账号\n用户名: ", regexMatched[1], "\n密码: ", regexMatched[2])) } }) From 10a35ac6e1087486f29ad9d6495700d17e62269f Mon Sep 17 00:00:00 2001 From: Jiang-Red <79574799+Jiang-Red@users.noreply.github.com> Date: Wed, 21 Aug 2024 04:37:53 +0000 Subject: [PATCH 5/5] add cache --- control/servicepic.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/control/servicepic.go b/control/servicepic.go index 2e21c9b..0839c64 100644 --- a/control/servicepic.go +++ b/control/servicepic.go @@ -27,6 +27,8 @@ type plugininfo struct { } var ( + // serverlistlogo 缓存 + serverlistlogo image.Image // 字体 GlowSans 数据 glowsd []byte // 字体 Impact 数据 @@ -82,9 +84,11 @@ func renderservepicof(gid int64) (img image.Image, err error) { if err != nil { return } - serverlistlogo, err := renderserverlistlogo() - if err != nil { - return + if serverlistlogo == nil { + serverlistlogo, err = renderserverlistlogo() + if err != nil { + return + } } listnum := len(pluginlist) ln := math.Ceil(listnum, 3)