diff --git a/README.md b/README.md index b9795b9f49..b5173746d5 100644 --- a/README.md +++ b/README.md @@ -926,23 +926,6 @@ print("run[CQ:image,file="+j["img"]+"]") - [x] 更新gal - -
- 早报 - - `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"` - - - api早上8点更新,推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用 - - - [x] /启用 zaobao - - - [x] /禁用 zaobao - -``` -记录在"00 9 * * *"触发的指令 -今日早报 -``` -
舔狗日记 diff --git a/main.go b/main.go index 715e3bd78a..0044a6bb81 100644 --- a/main.go +++ b/main.go @@ -113,7 +113,6 @@ import ( _ "github.com/FloatTech/ZeroBot-Plugin/plugin/word_count" // 聊天热词 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle" // 猜单词 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal" // 月幕galgame - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao" // 早报 // _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf" // 鬼东西 // _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push" // b站推送 diff --git a/plugin/zaobao/zaobao.go b/plugin/zaobao/zaobao.go deleted file mode 100644 index 5d76a7e06a..0000000000 --- a/plugin/zaobao/zaobao.go +++ /dev/null @@ -1,66 +0,0 @@ -// Package zaobao 易即今日公众号api的今日早报 -package zaobao - -import ( - "sync" - "time" - - "github.com/tidwall/gjson" - zero "github.com/wdvxdr1123/ZeroBot" - "github.com/wdvxdr1123/ZeroBot/message" - - ctrl "github.com/FloatTech/zbpctrl" - "github.com/FloatTech/zbputils/binary" - "github.com/FloatTech/zbputils/control" - "github.com/FloatTech/zbputils/web" -) - -const ( - api = "http://api.soyiji.com/news_jpg" - referer = "safe.soyiji.com" - ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66" -) - -var ( - picdata []byte - mu sync.Mutex - pictime time.Time -) - -func init() { // 插件主体 - engine := control.Register("zaobao", &ctrl.Options[*zero.Ctx]{ - DisableOnDefault: true, - Help: "易即今日公众号api的今日早报\n" + - "api早上8点更新,推荐定时在8点30后\n" + - "配合插件job中的记录在\"cron\"触发的指令使用\n" + - "- 记录在\"0 9 * * *\"触发的指令\n" + - " - 今日早报", - }) - engine.OnFullMatch("今日早报", zero.OnlyGroup).SetBlock(false). - Handle(func(ctx *zero.Ctx) { - err := getdata() - if err != nil { - ctx.SendChain(message.Text("ERROR:", err)) - return - } - ctx.SendChain(message.ImageBytes(picdata)) - }) -} - -func getdata() error { // 获取图片链接并且下载 - mu.Lock() - defer mu.Unlock() - if picdata != nil && time.Since(pictime) <= time.Hour*8 && time.Now().Day() == pictime.Day() { - return nil - } - data, err := web.RequestDataWith(web.NewDefaultClient(), api, "GET", "", ua) - if err != nil { - return err - } - picdata, err = web.RequestDataWith(web.NewDefaultClient(), gjson.Get(binary.BytesToString(data), "url").String(), "GET", referer, ua) - if err != nil { - return err - } - pictime = time.Now() - return nil -}