optimize(bilibili): separate packages

2026-02-12 02:00:24 +00:00 · 2025-09-27 01:02:53 +08:00
parent c22e4b543c
commit 1e2d425cf4
12 changed files with 49 additions and 491 deletions
--- a/plugin/animetrace/main.go
+++ b/plugin/animetrace/main.go
@@ -23,7 +23,7 @@ import (
 )

 func init() {
-	engine := control.Register("animetrace", &ctrl.Options[*zero.Ctx]{
+	engine := control.AutoRegister(&ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "AnimeTrace 动画/Galgame识别插件",
 		Help:             "- Gal识图\n- 动漫识图\n- 动漫识图 2\n- 动漫识图 [模型名]\n- Gal识图 [模型名]",
--- a/plugin/bilibili/bilibili.go
+++ b/plugin/bilibili/bilibili.go
@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"regexp"
 	"sort"
 	"strconv"
 	"time"
@@ -31,7 +30,6 @@ import (
 )

 var (
-	re             = regexp.MustCompile(`^\d+$`)
 	danmakuTypeMap = map[int64]string{
 		0: "普通消息",
 		1: "礼物",
@@ -73,7 +71,7 @@ func init() {
 		}
 		return true
 	})
-	engine.OnRegex(`^>user info\s?(.{1,25})$`, getPara).SetBlock(true).
+	engine.OnRegex(`^>user info\s?(.{1,25})$`, bz.RequireUser(cfg)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			id := ctx.State["uid"].(string)
 			card, err := bz.GetMemberCard(id)
@@ -91,7 +89,7 @@ func init() {
 			))
 		})

-	engine.OnRegex(`^>vup info\s?(.{1,25})$`, getPara).SetBlock(true).
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`, bz.RequireUser(cfg)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			id := ctx.State["uid"].(string)
 			// 获取详情
@@ -114,7 +112,7 @@ func init() {
 			))
 		})

-	engine.OnRegex(`^查成分\s?(.{1,25})$`, getPara, getdb).SetBlock(true).
+	engine.OnRegex(`^查成分\s?(.{1,25})$`, bz.RequireUser(cfg), getdb).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			id := ctx.State["uid"].(string)
 			today := time.Now().Format("20060102")
@@ -134,7 +132,7 @@ func init() {
 				return
 			}
 			vupLen := len(vups)
-			medals, err := bz.GetMedalWall(cfg, id)
+			medals, err := cfg.GetMedalWall(id)
 			sort.Sort(bz.MedalSorter(medals))
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
@@ -275,7 +273,7 @@ func init() {
 			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
 		})

-	engine.OnRegex(`^查弹幕\s?(\S{1,25})\s?(\d*)$`, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnRegex(`^查弹幕\s?(\S{1,25})\s?(\d*)$`, bz.RequireUser(cfg)).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		id := ctx.State["uid"].(string)
 		pagenum := ctx.State["regex_matched"].([]string)[2]
 		if pagenum == "" {
@@ -582,51 +580,3 @@ func int2rbg(t int64) (int64, int64, int64) {
 	b, g, r := int64(buf[0]), int64(buf[1]), int64(buf[2])
 	return r, g, b
 }
-
-func getPara(ctx *zero.Ctx) bool {
-	keyword := ctx.State["regex_matched"].([]string)[1]
-	if !re.MatchString(keyword) {
-		searchRes, err := bz.SearchUser(cfg, keyword)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return false
-		}
-		ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)
-		return true
-	}
-	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
-	recv, cancel := next.Repeat()
-	defer cancel()
-	ctx.SendChain(message.Text("输入为纯数字, 请选择查询uid还是用户名, 输入对应序号：\n0. 查询uid\n1. 查询用户名"))
-	for {
-		select {
-		case <-time.After(time.Second * 10):
-			ctx.SendChain(message.Text("时间太久啦！", zero.BotConfig.NickName[0], "帮你选择查询uid"))
-			ctx.State["uid"] = keyword
-			return true
-		case c := <-recv:
-			msg := c.Event.Message.ExtractPlainText()
-			num, err := strconv.Atoi(msg)
-			if err != nil {
-				ctx.SendChain(message.Text("请输入数字!"))
-				continue
-			}
-			if num < 0 || num > 1 {
-				ctx.SendChain(message.Text("序号非法!"))
-				continue
-			}
-			if num == 0 {
-				ctx.State["uid"] = keyword
-				return true
-			} else if num == 1 {
-				searchRes, err := bz.SearchUser(cfg, keyword)
-				if err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-					return false
-				}
-				ctx.State["uid"] = strconv.FormatInt(searchRes[0].Mid, 10)
-				return true
-			}
-		}
-	}
-}
--- a/plugin/bilibili/card2msg.go
+++ b/plugin/bilibili/card2msg.go
@@ -1,342 +0,0 @@
-package bilibili
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	bz "github.com/FloatTech/AnimeAPI/bilibili"
-	"github.com/FloatTech/floatbox/binary"
-	"github.com/FloatTech/floatbox/web"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-var (
-	msgType = map[int]string{
-		1:    "转发了动态",
-		2:    "有图营业",
-		4:    "无图营业",
-		8:    "投稿了视频",
-		16:   "投稿了短视频",
-		64:   "投稿了文章",
-		256:  "投稿了音频",
-		2048: "发布了简报",
-		4200: "发布了直播",
-		4308: "发布了直播",
-	}
-)
-
-// dynamicCard2msg 处理DynCard
-func dynamicCard2msg(dynamicCard *bz.DynamicCard) (msg []message.Segment, err error) {
-	var (
-		card  bz.Card
-		vote  bz.Vote
-		cType int
-	)
-	msg = make([]message.Segment, 0, 16)
-	// 初始化结构体
-	err = json.Unmarshal(binary.StringToBytes(dynamicCard.Card), &card)
-	if err != nil {
-		return
-	}
-	if dynamicCard.Extension.Vote != "" {
-		err = json.Unmarshal(binary.StringToBytes(dynamicCard.Extension.Vote), &vote)
-		if err != nil {
-			return
-		}
-	}
-	cType = dynamicCard.Desc.Type
-	// 生成消息
-	switch cType {
-	case 1:
-		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
-			card.Item.Content, "\n",
-			"转发的内容: \n"))
-		var originMsg []message.Segment
-		var co bz.Card
-		co, err = bz.LoadCardDetail(card.Origin)
-		if err != nil {
-			return
-		}
-		originMsg, err = card2msg(dynamicCard, &co, card.Item.OrigType)
-		if err != nil {
-			return
-		}
-		msg = append(msg, originMsg...)
-	case 2:
-		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Description))
-		for i := 0; i < len(card.Item.Pictures); i++ {
-			msg = append(msg, message.Image(card.Item.Pictures[i].ImgSrc))
-		}
-	case 4:
-		msg = append(msg, message.Text(card.User.Uname, "在", time.Unix(int64(card.Item.Timestamp), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Content, "\n"))
-		if dynamicCard.Extension.Vote != "" {
-			msg = append(msg, message.Text("【投票】", vote.Desc, "\n",
-				"截止日期: ", time.Unix(int64(vote.Endtime), 0).Format("2006-01-02 15:04:05"), "\n",
-				"参与人数: ", bz.HumanNum(vote.JoinNum), "\n",
-				"投票选项( 最多选择", vote.ChoiceCnt, "项 )\n"))
-			for i := 0; i < len(vote.Options); i++ {
-				msg = append(msg, message.Text("- ", vote.Options[i].Idx, ". ", vote.Options[i].Desc, "\n"))
-				if vote.Options[i].ImgURL != "" {
-					msg = append(msg, message.Image(vote.Options[i].ImgURL))
-				}
-			}
-		}
-	case 8:
-		msg = append(msg, message.Text(card.Owner.Name, "在", time.Unix(int64(card.Pubdate), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title))
-		msg = append(msg, message.Image(card.Pic))
-		msg = append(msg, message.Text(card.Desc, "\n",
-			card.ShareSubtitle, "\n",
-			"视频链接: ", card.ShortLink, "\n"))
-	case 16:
-		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Description))
-		msg = append(msg, message.Image(card.Item.Cover.Default))
-	case 64:
-		msg = append(msg, message.Text(card.Author.(map[string]any)["name"], "在", time.Unix(int64(card.PublishTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title, "\n",
-			card.Summary))
-		for i := 0; i < len(card.ImageUrls); i++ {
-			msg = append(msg, message.Image(card.ImageUrls[i]))
-		}
-		if card.ID != 0 {
-			msg = append(msg, message.Text("文章链接: https://www.bilibili.com/read/cv", card.ID, "\n"))
-		}
-	case 256:
-		msg = append(msg, message.Text(card.Upper, "在", time.Unix(int64(card.Ctime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title))
-		msg = append(msg, message.Image(card.Cover))
-		msg = append(msg, message.Text(card.Intro, "\n"))
-		if card.ID != 0 {
-			msg = append(msg, message.Text("音频链接: https://www.bilibili.com/audio/au", card.ID, "\n"))
-		}
-
-	case 2048:
-		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
-			card.Vest.Content, "\n",
-			card.Sketch.Title, "\n",
-			card.Sketch.DescText, "\n"))
-		msg = append(msg, message.Image(card.Sketch.CoverURL))
-		msg = append(msg, message.Text("分享链接: ", card.Sketch.TargetURL, "\n"))
-	case 4308:
-		if dynamicCard.Desc.UserProfile.Info.Uname != "" {
-			msg = append(msg, message.Text(dynamicCard.Desc.UserProfile.Info.Uname, msgType[cType], "\n"))
-		}
-		msg = append(msg, message.Image(card.LivePlayInfo.Cover))
-		msg = append(msg, message.Text("\n", card.LivePlayInfo.Title, "\n",
-			"房间号: ", card.LivePlayInfo.RoomID, "\n",
-			"分区: ", card.LivePlayInfo.ParentAreaName))
-		if card.LivePlayInfo.ParentAreaName != card.LivePlayInfo.AreaName {
-			msg = append(msg, message.Text("-", card.LivePlayInfo.AreaName))
-		}
-		if card.LivePlayInfo.LiveStatus == 0 {
-			msg = append(msg, message.Text("未开播 \n"))
-		} else {
-			msg = append(msg, message.Text("直播中 ", card.LivePlayInfo.WatchedShow, "\n"))
-		}
-		msg = append(msg, message.Text("直播链接: ", card.LivePlayInfo.Link))
-	default:
-		msg = append(msg, message.Text("动态id: ", dynamicCard.Desc.DynamicIDStr, "未知动态类型: ", cType, "\n"))
-	}
-	if dynamicCard.Desc.DynamicIDStr != "" {
-		msg = append(msg, message.Text("动态链接: ", bz.TURL, dynamicCard.Desc.DynamicIDStr))
-	}
-	return
-}
-
-// card2msg cType=1, 2, 4, 8, 16, 64, 256, 2048, 4200, 4308时,处理Card字符串,cType为card类型
-func card2msg(dynamicCard *bz.DynamicCard, card *bz.Card, cType int) (msg []message.Segment, err error) {
-	var (
-		vote bz.Vote
-	)
-	msg = make([]message.Segment, 0, 16)
-	// 生成消息
-	switch cType {
-	case 1:
-		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
-			card.Item.Content, "\n",
-			"转发的内容: \n"))
-		var originMsg []message.Segment
-		var co bz.Card
-		co, err = bz.LoadCardDetail(card.Origin)
-		if err != nil {
-			return
-		}
-		originMsg, err = card2msg(dynamicCard, &co, card.Item.OrigType)
-		if err != nil {
-			return
-		}
-		msg = append(msg, originMsg...)
-	case 2:
-		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Description))
-		for i := 0; i < len(card.Item.Pictures); i++ {
-			msg = append(msg, message.Image(card.Item.Pictures[i].ImgSrc))
-		}
-	case 4:
-		msg = append(msg, message.Text(card.User.Uname, "在", time.Unix(int64(card.Item.Timestamp), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Content, "\n"))
-		if dynamicCard.Extension.Vote != "" {
-			msg = append(msg, message.Text("【投票】", vote.Desc, "\n",
-				"截止日期: ", time.Unix(int64(vote.Endtime), 0).Format("2006-01-02 15:04:05"), "\n",
-				"参与人数: ", bz.HumanNum(vote.JoinNum), "\n",
-				"投票选项( 最多选择", vote.ChoiceCnt, "项 )\n"))
-			for i := 0; i < len(vote.Options); i++ {
-				msg = append(msg, message.Text("- ", vote.Options[i].Idx, ". ", vote.Options[i].Desc, "\n"))
-				if vote.Options[i].ImgURL != "" {
-					msg = append(msg, message.Image(vote.Options[i].ImgURL))
-				}
-			}
-		}
-	case 8:
-		msg = append(msg, message.Text(card.Owner.Name, "在", time.Unix(int64(card.Pubdate), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title))
-		msg = append(msg, message.Image(card.Pic))
-		msg = append(msg, message.Text(card.Desc, "\n",
-			card.ShareSubtitle, "\n",
-			"视频链接: ", card.ShortLink, "\n"))
-	case 16:
-		msg = append(msg, message.Text(card.User.Name, "在", time.Unix(int64(card.Item.UploadTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Item.Description))
-		msg = append(msg, message.Image(card.Item.Cover.Default))
-	case 64:
-		msg = append(msg, message.Text(card.Author.(map[string]any)["name"], "在", time.Unix(int64(card.PublishTime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title, "\n",
-			card.Summary))
-		for i := 0; i < len(card.ImageUrls); i++ {
-			msg = append(msg, message.Image(card.ImageUrls[i]))
-		}
-		if card.ID != 0 {
-			msg = append(msg, message.Text("文章链接: https://www.bilibili.com/read/cv", card.ID, "\n"))
-		}
-	case 256:
-		msg = append(msg, message.Text(card.Upper, "在", time.Unix(int64(card.Ctime), 0).Format("2006-01-02 15:04:05"), msgType[cType], "\n",
-			card.Title))
-		msg = append(msg, message.Image(card.Cover))
-		msg = append(msg, message.Text(card.Intro, "\n"))
-		if card.ID != 0 {
-			msg = append(msg, message.Text("音频链接: https://www.bilibili.com/audio/au", card.ID, "\n"))
-		}
-
-	case 2048:
-		msg = append(msg, message.Text(card.User.Uname, msgType[cType], "\n",
-			card.Vest.Content, "\n",
-			card.Sketch.Title, "\n",
-			card.Sketch.DescText, "\n"))
-		msg = append(msg, message.Image(card.Sketch.CoverURL))
-		msg = append(msg, message.Text("分享链接: ", card.Sketch.TargetURL, "\n"))
-	case 4308:
-		if dynamicCard.Desc.UserProfile.Info.Uname != "" {
-			msg = append(msg, message.Text(dynamicCard.Desc.UserProfile.Info.Uname, msgType[cType], "\n"))
-		}
-		msg = append(msg, message.Image(card.LivePlayInfo.Cover))
-		msg = append(msg, message.Text("\n", card.LivePlayInfo.Title, "\n",
-			"房间号: ", card.LivePlayInfo.RoomID, "\n",
-			"分区: ", card.LivePlayInfo.ParentAreaName))
-		if card.LivePlayInfo.ParentAreaName != card.LivePlayInfo.AreaName {
-			msg = append(msg, message.Text("-", card.LivePlayInfo.AreaName))
-		}
-		if card.LivePlayInfo.LiveStatus == 0 {
-			msg = append(msg, message.Text("未开播 \n"))
-		} else {
-			msg = append(msg, message.Text("直播中 ", card.LivePlayInfo.WatchedShow, "\n"))
-		}
-		msg = append(msg, message.Text("直播链接: ", card.LivePlayInfo.Link))
-	default:
-		msg = append(msg, message.Text("动态id: ", dynamicCard.Desc.DynamicIDStr, "未知动态类型: ", cType, "\n"))
-	}
-	if dynamicCard.Desc.DynamicIDStr != "" {
-		msg = append(msg, message.Text("动态链接: ", bz.TURL, dynamicCard.Desc.DynamicIDStr))
-	}
-	return
-}
-
-// dynamicDetail 用动态id查动态信息
-func dynamicDetail(cookiecfg *bz.CookieConfig, dynamicIDStr string) (msg []message.Segment, err error) {
-	dyc, err := bz.GetDynamicDetail(cookiecfg, dynamicIDStr)
-	if err != nil {
-		return
-	}
-	return dynamicCard2msg(&dyc)
-}
-
-// articleCard2msg 专栏转消息
-func articleCard2msg(card bz.Card, defaultID string) (msg []message.Segment) {
-	msg = make([]message.Segment, 0, 16)
-	for i := 0; i < len(card.OriginImageUrls); i++ {
-		msg = append(msg, message.Image(card.OriginImageUrls[i]))
-	}
-	msg = append(msg, message.Text("\n", card.Title, "\n", "UP主: ", card.AuthorName, "\n",
-		"阅读: ", bz.HumanNum(card.Stats.View), " 评论: ", bz.HumanNum(card.Stats.Reply), "\n",
-		bz.CVURL, defaultID))
-	return
-}
-
-// liveCard2msg 直播卡片转消息
-func liveCard2msg(card bz.RoomCard) (msg []message.Segment) {
-	msg = make([]message.Segment, 0, 16)
-	msg = append(msg, message.Image(card.RoomInfo.Keyframe))
-	msg = append(msg, message.Text("\n", card.RoomInfo.Title, "\n",
-		"主播: ", card.AnchorInfo.BaseInfo.Uname, "\n",
-		"房间号: ", card.RoomInfo.RoomID, "\n"))
-	if card.RoomInfo.ShortID != 0 {
-		msg = append(msg, message.Text("短号: ", card.RoomInfo.ShortID, "\n"))
-	}
-	msg = append(msg, message.Text("分区: ", card.RoomInfo.ParentAreaName))
-	if card.RoomInfo.ParentAreaName != card.RoomInfo.AreaName {
-		msg = append(msg, message.Text("-", card.RoomInfo.AreaName))
-	}
-	if card.RoomInfo.LiveStatus == 0 {
-		msg = append(msg, message.Text("未开播 \n"))
-	} else {
-		msg = append(msg, message.Text("直播中 ", bz.HumanNum(card.RoomInfo.Online), "人气\n"))
-	}
-	if card.RoomInfo.ShortID != 0 {
-		msg = append(msg, message.Text("直播间链接: ", bz.LURL, card.RoomInfo.ShortID))
-	} else {
-		msg = append(msg, message.Text("直播间链接: ", bz.LURL, card.RoomInfo.RoomID))
-	}
-
-	return
-}
-
-// videoCard2msg 视频卡片转消息
-func videoCard2msg(card bz.Card) (msg []message.Segment, err error) {
-	var (
-		mCard       bz.MemberCard
-		onlineTotal bz.OnlineTotal
-	)
-	msg = make([]message.Segment, 0, 16)
-	mCard, err = bz.GetMemberCard(card.Owner.Mid)
-	msg = append(msg, message.Text("标题: ", card.Title, "\n"))
-	if card.Rights.IsCooperation == 1 {
-		for i := 0; i < len(card.Staff); i++ {
-			msg = append(msg, message.Text(card.Staff[i].Title, ": ", card.Staff[i].Name, " 粉丝: ", bz.HumanNum(card.Staff[i].Follower), "\n"))
-		}
-	} else {
-		if err != nil {
-			msg = append(msg, message.Text("UP主: ", card.Owner.Name, "\n"))
-		} else {
-			msg = append(msg, message.Text("UP主: ", card.Owner.Name, " 粉丝: ", bz.HumanNum(mCard.Fans), "\n"))
-		}
-	}
-	msg = append(msg, message.Image(card.Pic))
-	data, err := web.GetData(fmt.Sprintf(bz.OnlineTotalURL, card.BvID, card.CID))
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(data, &onlineTotal)
-	if err != nil {
-		return
-	}
-	msg = append(msg, message.Text("👀播放: ", bz.HumanNum(card.Stat.View), " 💬弹幕: ", bz.HumanNum(card.Stat.Danmaku),
-		"\n👍点赞: ", bz.HumanNum(card.Stat.Like), " 💰投币: ", bz.HumanNum(card.Stat.Coin),
-		"\n📁收藏: ", bz.HumanNum(card.Stat.Favorite), " 🔗分享: ", bz.HumanNum(card.Stat.Share),
-		"\n📝简介: ", card.Desc,
-		"\n🏄‍♂️ 总共 ", onlineTotal.Data.Total, " 人在观看，", onlineTotal.Data.Count, " 人在网页端观看\n",
-		bz.VURL, card.BvID, "\n\n"))
-	return
-}
--- a/plugin/bilibili/card2msg_test.go
+++ b/plugin/bilibili/card2msg_test.go
@@ -1,55 +0,0 @@
-package bilibili
-
-import (
-	"testing"
-
-	bz "github.com/FloatTech/AnimeAPI/bilibili"
-)
-
-func TestArticleInfo(t *testing.T) {
-	card, err := bz.GetArticleInfo("17279244")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(articleCard2msg(card, "17279244"))
-
-}
-
-func TestMemberCard(t *testing.T) {
-	card, err := bz.GetMemberCard(2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("%+v\n", card)
-}
-
-func TestVideoInfo(t *testing.T) {
-	card, err := bz.GetVideoInfo("10007")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(videoCard2msg(card))
-	card, err = bz.GetVideoInfo("BV1xx411c7mD")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(videoCard2msg(card))
-	card, err = bz.GetVideoInfo("bv1xx411c7mD")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(videoCard2msg(card))
-	card, err = bz.GetVideoInfo("BV1mF411j7iU")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(videoCard2msg(card))
-}
-
-func TestLiveRoomInfo(t *testing.T) {
-	card, err := bz.GetLiveRoomInfo("83171", "b_ut=7;buvid3=0;i-wanna-go-back=-1;innersign=0;")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Log(liveCard2msg(card))
-}
--- a/plugin/bilibili/bilibilimodel.go
+++ b/plugin/bilibili/bilibilimodel.go
--- a/plugin/bilibili/bilibili_parse.go
+++ b/plugin/bilibili/bilibili_parse.go
@@ -1,5 +1,5 @@
-// Package bilibili bilibili卡片解析
-package bilibili
+// Package bilibiliparse bilibili卡片解析
+package bilibiliparse

 import (
 	"bytes"
@@ -29,6 +29,7 @@ const (
 	enableVideoDownload  = int64(0x20)
 	disableVideoDownload = ^enableVideoDownload
 	bilibiliparseReferer = "https://www.bilibili.com"
+	ua                   = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
 )

 var (
@@ -42,11 +43,12 @@ var (
 	searchArticleRe  = regexp.MustCompile(searchArticle)
 	searchLiveRoomRe = regexp.MustCompile(searchLiveRoom)
 	cachePath        string
+	cfg              = bz.NewCookieConfig("data/Bilibili/config.json")
 )

 // 插件主体
 func init() {
-	en := control.Register("bilibiliparse", &ctrl.Options[*zero.Ctx]{
+	en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "b站链接解析",
 		Help:             "例:- t.bilibili.com/642277677329285174\n- bilibili.com/read/cv17134450\n- bilibili.com/video/BV13B4y1x7pS\n- live.bilibili.com/22603245 ",
@@ -152,7 +154,7 @@ func handleVideo(ctx *zero.Ctx) {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
-	msg, err := videoCard2msg(card)
+	msg, err := card.ToVideoMessage()
 	if err != nil {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
@@ -178,7 +180,7 @@ func handleVideo(ctx *zero.Ctx) {
 }

 func handleDynamic(ctx *zero.Ctx) {
-	msg, err := dynamicDetail(cfg, ctx.State["regex_matched"].([]string)[2])
+	msg, err := cfg.GetDetailMessage(ctx.State["regex_matched"].([]string)[2])
 	if err != nil {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
@@ -192,7 +194,7 @@ func handleArticle(ctx *zero.Ctx) {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
-	ctx.SendChain(articleCard2msg(card, ctx.State["regex_matched"].([]string)[1])...)
+	ctx.SendChain(card.ToArticleMessage(ctx.State["regex_matched"].([]string)[1])...)
 }

 func handleLive(ctx *zero.Ctx) {
@@ -206,7 +208,7 @@ func handleLive(ctx *zero.Ctx) {
 		ctx.SendChain(message.Text("ERROR: ", err))
 		return
 	}
-	ctx.SendChain(liveCard2msg(card)...)
+	ctx.SendChain(card.ToMessage()...)
 }

 // getVideoSummary AI视频总结
--- a/plugin/bilibilipush/bilibilipush.go
+++ b/plugin/bilibilipush/bilibilipush.go
@@ -1,5 +1,5 @@
-// Package bilibili b站推送
-package bilibili
+// Package bilibilipush b站推送
+package bilibilipush

 import (
 	"bytes"
@@ -34,10 +34,11 @@ var (
 	lastTime   = map[int64]int64{}
 	liveStatus = map[int64]int{}
 	upMap      = map[int64]string{}
+	cfg        = bz.NewCookieConfig("data/Bilibili/config.json")
 )

 func init() {
-	en := control.Register("bilibilipush", &ctrl.Options[*zero.Ctx]{
+	en := control.AutoRegister(&ctrl.Options[*zero.Ctx]{
 		DisableOnDefault: false,
 		Brief:            "b站推送",
 		Help: "- 添加b站订阅[uid|name]\n" +
@@ -75,7 +76,7 @@ func init() {
 		ctx.SendChain(message.Text("已关闭艾特全体Oo"))
 	})

-	en.OnRegex(`^添加[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, bz.RequireUser(cfg)).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid, cfg)
 		if err != nil || name == "" {
@@ -93,7 +94,7 @@ func init() {
 		ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 	})

-	en.OnRegex(`^取消[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, bz.RequireUser(cfg)).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid, cfg)
 		if err != nil {
@@ -110,7 +111,7 @@ func init() {
 		}
 		ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消[B|b]站动态订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站动态订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, bz.RequireUser(cfg)).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		name, err := getName(buid, cfg)
 		if err != nil {
@@ -127,7 +128,7 @@ func init() {
 		}
 		ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 	})
-	en.OnRegex(`^取消[B|b]站直播订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, getPara).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消[B|b]站直播订阅\s?(.{1,25})$`, zero.UserOrGrpAdmin, bz.RequireUser(cfg)).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["uid"].(string), 10, 64)
 		gid := ctx.Event.GroupID
 		if gid == 0 {
@@ -333,7 +334,7 @@ func sendDynamic(ctx *zero.Ctx) error {
 						err = errors.Errorf("动态%v的解析有问题,%v", cardList[i].Get("desc.dynamic_id_str"), err)
 						return err
 					}
-					msg, err := dynamicCard2msg(&dc)
+					msg, err := dc.ToMessage()
 					if err != nil {
 						err = errors.Errorf("动态%v的解析有问题,%v", cardList[i].Get("desc.dynamic_id_str"), err)
 						return err
--- a/plugin/bilibili/bilibilipushmodel.go
+++ b/plugin/bilibili/bilibilipushmodel.go
@@ -1,4 +1,4 @@
-package bilibili
+package bilibilipush

 import (
 	"encoding/json"