From 1c274d6eb82546141f627a5d5fedaa3341417d6b 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: Wed, 1 Mar 2023 12:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20banner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- console/console.go | 10 ++++++++++ console/console_windows.go | 4 ++-- kanban/{ => banner}/banner.go | 6 +++--- kanban/gen/banner.go | 4 ++-- kanban/init.go | 4 +++- main.go | 10 ++++++---- plugin/ai_false/ai_false.go | 6 +++--- plugin/score/sign_in.go | 6 +++--- 8 files changed, 32 insertions(+), 18 deletions(-) rename kanban/{ => banner}/banner.go (73%) diff --git a/console/console.go b/console/console.go index 8cf28292..5c0d5048 100644 --- a/console/console.go +++ b/console/console.go @@ -1,2 +1,12 @@ // Package console sets console's behavior on init package console + +import ( + "fmt" + + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" +) + +func init() { + fmt.Print("\033]0;ZeroBot-Blugin " + banner.Version + " " + banner.Copyright + "\007") +} diff --git a/console/console_windows.go b/console/console_windows.go index 76016240..5727ac42 100644 --- a/console/console_windows.go +++ b/console/console_windows.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/FloatTech/ZeroBot-Plugin/kanban" + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" ) var ( @@ -78,7 +78,7 @@ func init() { // windows 带颜色 log 自定义格式 logrus.SetFormatter(&LogFormat{}) - err = setConsoleTitle("ZeroBot-Blugin " + kanban.Version + " " + kanban.Copyright) + err = setConsoleTitle("ZeroBot-Blugin " + banner.Version + " " + banner.Copyright) if err != nil { panic(err) } diff --git a/kanban/banner.go b/kanban/banner/banner.go similarity index 73% rename from kanban/banner.go rename to kanban/banner/banner.go index 9852f306..044b394a 100644 --- a/kanban/banner.go +++ b/kanban/banner/banner.go @@ -1,15 +1,15 @@ // Code generated by kanban/gen. DO NOT EDIT. -package kanban +package banner // Version ... -var Version = "v1.7.0-beta1" +var Version = "v1.6.2" // Copyright ... var Copyright = "© 2020 - 2023 FloatTech" // Banner ... var Banner = "* OneBot + ZeroBot + Golang\n" + - "* Version " + Version + " - 2023-03-01 11:21:16 +0800 CST\n" + + "* Version " + Version + " - 2023-03-01 12:17:07 +0800 CST\n" + "* Copyright " + Copyright + ". All Rights Reserved.\n" + "* Project: https://github.com/FloatTech/ZeroBot-Plugin" diff --git a/kanban/gen/banner.go b/kanban/gen/banner.go index 54727979..3af4a998 100644 --- a/kanban/gen/banner.go +++ b/kanban/gen/banner.go @@ -12,7 +12,7 @@ import ( const banner = `// Code generated by kanban/gen. DO NOT EDIT. -package kanban +package banner // Version ... var Version = "%s" @@ -30,7 +30,7 @@ var Banner = "* OneBot + ZeroBot + Golang\n" + const timeformat = `2006-01-02 15:04:05 +0800 CST` func main() { - f, err := os.Create("banner.go") + f, err := os.Create("banner/banner.go") if err != nil { panic(err) } diff --git a/kanban/init.go b/kanban/init.go index d09afd8c..d5976a5a 100644 --- a/kanban/init.go +++ b/kanban/init.go @@ -7,6 +7,8 @@ import ( "github.com/FloatTech/zbputils/control" "github.com/fumiama/go-registry" + + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" ) //go:generate go run github.com/FloatTech/ZeroBot-Plugin/kanban/gen @@ -23,7 +25,7 @@ var reg = registry.NewRegReader("reilia.fumiama.top:32664", control.Md5File, "fu func PrintBanner() { fmt.Print( "\n======================[ZeroBot-Plugin]======================", - "\n", Banner, "\n", + "\n", banner.Banner, "\n", "----------------------[ZeroBot-公告栏]----------------------", "\n", Kanban(), "\n", "============================================================\n\n", diff --git a/main.go b/main.go index 6fe5608f..d6d1cb27 100644 --- a/main.go +++ b/main.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "github.com/FloatTech/ZeroBot-Plugin/kanban" // 在最前打印 banner - _ "github.com/FloatTech/ZeroBot-Plugin/console" // 更改控制台属性 + "github.com/FloatTech/ZeroBot-Plugin/kanban" // 打印 banner + // ---------以下插件均可通过前面加 // 注释，注释后停用并不加载插件--------- // // ----------------------插件优先级按顺序从高到低---------------------- // // // @@ -190,6 +190,8 @@ import ( zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/driver" "github.com/wdvxdr1123/ZeroBot/message" + + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" // -----------------------以上为内置依赖，勿动------------------------ // ) @@ -301,11 +303,11 @@ func main() { // 帮助 zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true). Handle(func(ctx *zero.Ctx) { - ctx.SendChain(message.Text(kanban.Banner, "\n管理发送\"/服务列表\"查看 bot 功能\n发送\"/用法name\"查看功能用法")) + ctx.SendChain(message.Text(banner.Banner, "\n管理发送\"/服务列表\"查看 bot 功能\n发送\"/用法name\"查看功能用法")) }) zero.OnFullMatch("查看zbp公告", zero.OnlyToMe, zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { - ctx.SendChain(message.Text(kanban.Kanban())) + ctx.SendChain(message.Text(strings.ReplaceAll(kanban.Kanban(), "\t", ""))) }) zero.RunAndBlock(&config.Z, process.GlobalInitMutex.Unlock) } diff --git a/plugin/ai_false/ai_false.go b/plugin/ai_false/ai_false.go index 43677da6..56310986 100644 --- a/plugin/ai_false/ai_false.go +++ b/plugin/ai_false/ai_false.go @@ -33,7 +33,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/FloatTech/ZeroBot-Plugin/kanban" + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" zero "github.com/wdvxdr1123/ZeroBot" "github.com/wdvxdr1123/ZeroBot/message" @@ -453,9 +453,9 @@ func drawstatus(m *ctrl.Control[*zero.Ctx], uid int64, botname string) (sendimg return } canvas.SetRGBA255(0, 0, 0, 255) - canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+kanban.Version, float64(canvas.W())/2+3, float64(canvas.H())-70/2+3, 0.5, 0.5) + canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+banner.Version, float64(canvas.W())/2+3, float64(canvas.H())-70/2+3, 0.5, 0.5) canvas.SetRGBA255(255, 255, 255, 255) - canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+kanban.Version, float64(canvas.W())/2, float64(canvas.H())-70/2, 0.5, 0.5) + canvas.DrawStringAnchored("Created By ZeroBot-Plugin "+banner.Version, float64(canvas.W())/2, float64(canvas.H())-70/2, 0.5, 0.5) sendimg = canvas.Image() return diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index d005db12..2c0198f3 100644 --- a/plugin/score/sign_in.go +++ b/plugin/score/sign_in.go @@ -13,7 +13,7 @@ import ( "github.com/disintegration/imaging" - "github.com/FloatTech/ZeroBot-Plugin/kanban" + "github.com/FloatTech/ZeroBot-Plugin/kanban/banner" "github.com/FloatTech/AnimeAPI/bilibili" "github.com/FloatTech/AnimeAPI/wallet" @@ -202,9 +202,9 @@ func init() { ctx.SendChain(message.Text("ERROR: ", err)) return } - canvas.DrawStringAnchored("Created By Zerobot-Plugin "+kanban.Version, float64(imgDX)/2, float64(imgDY)-20, 0.5, 0.5) // zbp + canvas.DrawStringAnchored("Created By Zerobot-Plugin "+banner.Version, float64(imgDX)/2, float64(imgDY)-20, 0.5, 0.5) // zbp canvas.SetRGB255(0, 0, 0) - canvas.DrawStringAnchored("Created By Zerobot-Plugin "+kanban.Version, float64(imgDX)/2-3, float64(imgDY)-19, 0.5, 0.5) // zbp + canvas.DrawStringAnchored("Created By Zerobot-Plugin "+banner.Version, float64(imgDX)/2-3, float64(imgDY)-19, 0.5, 0.5) // zbp canvas.SetRGB255(255, 255, 255) // Gradient grad := gg.NewLinearGradient(20, 320, 400, 20)