🔥 drop ioutil

2026-02-06 07:19:37 +00:00 · 2022-03-11 11:32:13 +08:00
parent 81d6a06dbe
commit edd9feb8f8
16 changed files with 95 additions and 253 deletions
--- a/plugin/bilibili/fansDaily.go
+++ b/plugin/bilibili/fansDaily.go
@@ -1,165 +0,0 @@
-package bilibili
-
-import (
-	"encoding/json"
-	"net/http"
-	"time"
-
-	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/process"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
-)
-
-type follower struct {
-	Mid      int    `json:"mid"`
-	Uname    string `json:"uname"`
-	Video    int    `json:"video"`
-	Roomid   int    `json:"roomid"`
-	Rise     int    `json:"rise"`
-	Follower int    `json:"follower"`
-	GuardNum int    `json:"guardNum"`
-	AreaRank int    `json:"areaRank"`
-}
-
-// 开启日报推送
-func init() {
-	fansDaily()
-	en := control.Register("fansdaily", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: true,
-		Help:             "fansdaily\n- /开启粉丝日报\n- /关闭粉丝日报",
-	})
-	zero.OnCommand("开启粉丝日报", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			m, ok := control.Lookup("fansdaily")
-			if ok {
-				if m.IsEnabledIn(ctx.Event.GroupID) {
-					ctx.Send(message.Text("已启用！"))
-				} else {
-					m.Enable(ctx.Event.GroupID)
-					ctx.Send(message.Text("添加成功！"))
-				}
-			} else {
-				ctx.Send(message.Text("找不到该服务！"))
-			}
-		})
-	en.OnCommand("关闭粉丝日报", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			m, ok := control.Lookup("fansdaily")
-			if ok {
-				if m.IsEnabledIn(ctx.Event.GroupID) {
-					m.Disable(ctx.Event.GroupID)
-					ctx.Send(message.Text("关闭成功！"))
-				} else {
-					ctx.Send(message.Text("未启用！"))
-				}
-			} else {
-				ctx.Send(message.Text("找不到该服务！"))
-			}
-		})
-}
-
-// 定时任务每天晚上最后2分钟执行一次
-func fansDaily() {
-	_, err := process.CronTab.AddFunc("58 23 * * *", func() { sendNotice() })
-	if err != nil {
-		panic(err)
-	}
-}
-
-// 获取数据拼接消息链并发送
-func getMsg() message.MessageSegment {
-	var (
-		diana  = fansapi("672328094")
-		ava    = fansapi("672346917")
-		eileen = fansapi("672342685")
-		bella  = fansapi("672353429")
-		carol  = fansapi("351609538")
-	)
-	return message.Text(
-		time.Now().Format("2006-01-02"), "    Asoul全团粉丝日报如下", "\n\n",
-		"uid: ", diana.Mid, "\n",
-		"名字: ", diana.Uname, "\n",
-		"当前粉丝数: ", diana.Follower, "\n",
-		"今日涨粉数: ", diana.Rise, "\n",
-		"视频投稿数: ", diana.Video, "\n",
-		"直播间id: ", diana.Roomid, "\n",
-		"舰队: ", diana.GuardNum, "\n",
-		"直播总排名: ", diana.AreaRank, "\n",
-		"数据来源: ", "https://vtbs.moe/detail/", "672328094", "\n\n",
-
-		"uid: ", ava.Mid, "\n",
-		"名字: ", ava.Uname, "\n",
-		"当前粉丝数: ", ava.Follower, "\n",
-		"今日涨粉数: ", ava.Rise, "\n",
-		"视频投稿数: ", ava.Video, "\n",
-		"直播间id: ", ava.Roomid, "\n",
-		"舰队: ", ava.GuardNum, "\n",
-		"直播总排名: ", ava.AreaRank, "\n",
-		"数据来源: ", "https://vtbs.moe/detail/", "672346917", "\n\n",
-
-		"uid: ", eileen.Mid, "\n",
-		"名字: ", eileen.Uname, "\n",
-		"当前粉丝数: ", eileen.Follower, "\n",
-		"今日涨粉数: ", eileen.Rise, "\n",
-		"视频投稿数: ", eileen.Video, "\n",
-		"直播间id: ", eileen.Roomid, "\n",
-		"舰队: ", eileen.GuardNum, "\n",
-		"直播总排名: ", eileen.AreaRank, "\n",
-		"数据来源: ", "https://vtbs.moe/detail/", "672342685", "\n\n",
-
-		"uid: ", bella.Mid, "\n",
-		"名字: ", bella.Uname, "\n",
-		"当前粉丝数: ", bella.Follower, "\n",
-		"今日涨粉数: ", bella.Rise, "\n",
-		"视频投稿数: ", bella.Video, "\n",
-		"直播间id: ", bella.Roomid, "\n",
-		"舰队: ", bella.GuardNum, "\n",
-		"直播总排名: ", bella.AreaRank, "\n",
-		"数据来源: ", "https://vtbs.moe/detail/", "672353429", "\n\n",
-
-		"uid: ", carol.Mid, "\n",
-		"名字: ", carol.Uname, "\n",
-		"当前粉丝数: ", carol.Follower, "\n",
-		"今日涨粉数: ", carol.Rise, "\n",
-		"视频投稿数: ", carol.Video, "\n",
-		"直播间id: ", carol.Roomid, "\n",
-		"舰队: ", carol.GuardNum, "\n",
-		"直播总排名: ", carol.AreaRank, "\n",
-		"数据来源: ", "https://vtbs.moe/detail/", "351609538",
-	)
-}
-
-// 获取数据拼接消息链并发送
-func sendNotice() {
-	m, ok := control.Lookup("fansdaily")
-	if ok {
-		msg := getMsg()
-		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-			for _, g := range ctx.GetGroupList().Array() {
-				grp := g.Get("group_id").Int()
-				if m.IsEnabledIn(grp) {
-					ctx.SendGroupMessage(grp, msg)
-				}
-			}
-			return true
-		})
-	}
-}
-
-// 请求api
-func fansapi(uid string) *follower {
-	url := "https://api.vtbs.moe/v1/detail/" + uid
-	resp, err := http.Get(url)
-	if err != nil {
-		panic(err)
-	}
-	defer resp.Body.Close()
-	result := &follower{}
-	if err := json.NewDecoder(resp.Body).Decode(result); err != nil {
-		panic(err)
-	}
-	return result
-}
--- a/plugin/bilibili/info.go
+++ b/plugin/bilibili/info.go
@@ -2,7 +2,7 @@
 package bilibili

 import (
-	"io/ioutil"
+	"io"
 	"net/http"

 	control "github.com/FloatTech/zbputils/control"
@@ -47,7 +47,7 @@ func init() {
 			}
 			defer res.Body.Close()

-			body, err := ioutil.ReadAll(res.Body)
+			body, err := io.ReadAll(res.Body)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
--- a/plugin/bilibili/live_info.go
+++ b/plugin/bilibili/live_info.go
@@ -1,11 +1,12 @@
 package bilibili

 import (
+	"encoding/json"
 	"errors"
-	"io/ioutil"
 	"net/http"
 	"time"

+	"github.com/FloatTech/zbputils/web"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -23,37 +24,62 @@ func init() {
 			}
 			id := res.Get("data.result.0.mid").String()
 			// 获取详情
-			json := fansapi(id)
+			fo, err := fansapi(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
 			ctx.SendChain(message.Text(
-				"uid: ", json.Mid, "\n",
-				"名字: ", json.Uname, "\n",
-				"当前粉丝数: ", json.Follower, "\n",
-				"24h涨粉数: ", json.Rise, "\n",
-				"视频投稿数: ", json.Video, "\n",
-				"直播间id: ", json.Roomid, "\n",
-				"舰队: ", json.GuardNum, "\n",
-				"直播总排名: ", json.AreaRank, "\n",
-				"数据来源: ", "https://vtbs.moe/detail/", json.Mid, "\n",
+				"uid: ", fo.Mid, "\n",
+				"名字: ", fo.Uname, "\n",
+				"当前粉丝数: ", fo.Follower, "\n",
+				"24h涨粉数: ", fo.Rise, "\n",
+				"视频投稿数: ", fo.Video, "\n",
+				"直播间id: ", fo.Roomid, "\n",
+				"舰队: ", fo.GuardNum, "\n",
+				"直播总排名: ", fo.AreaRank, "\n",
+				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
 				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
 			))
 		})
 }

 // 搜索api：通过把触发指令传入的昵称找出uid返回
-func uid(keyword string) (gjson.Result, error) {
+func uid(keyword string) (*gjson.Result, error) {
 	api := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&&user_type=1&keyword=" + keyword
-	resp, err := http.Get(api)
+	data, err := web.GetData(api)
 	if err != nil {
-		return gjson.Result{}, err
+		return nil, err
 	}
-	if resp.StatusCode != http.StatusOK {
-		return gjson.Result{}, errors.New("code not 200")
-	}
-	data, _ := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
 	json := gjson.ParseBytes(data)
 	if json.Get("data.numResults").Int() == 0 {
-		return gjson.Result{}, errors.New("查无此人")
+		return nil, errors.New("查无此人")
 	}
-	return json, nil
+	return &json, nil
+}
+
+type follower struct {
+	Mid      int    `json:"mid"`
+	Uname    string `json:"uname"`
+	Video    int    `json:"video"`
+	Roomid   int    `json:"roomid"`
+	Rise     int    `json:"rise"`
+	Follower int    `json:"follower"`
+	GuardNum int    `json:"guardNum"`
+	AreaRank int    `json:"areaRank"`
+}
+
+// 请求api
+func fansapi(uid string) (*follower, error) {
+	url := "https://api.vtbs.moe/v1/detail/" + uid
+	resp, err := http.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	result := &follower{}
+	if err := json.NewDecoder(resp.Body).Decode(result); err != nil {
+		return nil, err
+	}
+	return result, nil
 }