From 6d9724e8f5fbe8556f6f93c312272b1697364742 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: Fri, 10 Jun 2022 21:09:58 +0800 Subject: [PATCH] fix detail --- rule.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rule.go b/rule.go index 89463f3..a0a5e2a 100644 --- a/rule.go +++ b/rule.go @@ -10,6 +10,7 @@ import ( ctrl "github.com/FloatTech/zbpctrl" "github.com/FloatTech/zbputils/img/text" + "github.com/FloatTech/zbputils/img/writer" "github.com/FloatTech/zbputils/process" tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5" "github.com/sirupsen/logrus" @@ -308,14 +309,20 @@ func init() { msgs = append(msgs, i, ": ", service.EnableMarkIn(gid), key, "\n", service, "\n\n") return true }) - data, err := text.RenderToBase64(fmt.Sprint(msgs...), text.FontFile, 400, 20) + img, err := text.Render(fmt.Sprint(msgs...), text.FontFile, 400, 20) if err != nil { logrus.Errorf("[control] %v", err) } - _, _ = ctx.Caller.Send(tgba.NewPhoto(ctx.Message.Chat.ID, tgba.FileBytes{ + data, cl := writer.ToBytes(img.Image()) + _, err = ctx.Caller.Send(tgba.NewPhoto(ctx.Message.Chat.ID, tgba.FileBytes{ Name: "服务详情", Bytes: data, })) + cl() + if err != nil { + _, _ = ctx.Caller.Send(tgba.NewMessage(ctx.Message.Chat.ID, "ERROR: "+err.Error())) + return + } }) }) }