🐛 MustProvicePicture goroutine 泄漏

🎨 优化代码结构
2026-02-08 16:10:25 +00:00 · 2022-03-30 13:23:52 +08:00 · 2022-03-30 13:17:37 +08:00 · 2022-03-29 16:29:29 +08:00 · 2022-03-29 05:05:36 +00:00 · 2022-03-29 13:03:46 +08:00
10 changed files with 644 additions and 185 deletions
--- a/README.md
+++ b/README.md
@@ -234,6 +234,9 @@ print("run[CQ:image,file="+j["img"]+"]")
    - [x] 搜番 | 搜索番剧[图片]
 - **百度一下** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"`
    - [x] 百度下[xxx]
+- **百人一首** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hyaku"`
+    - [x] 百人一首
+    - [x] 百人一首之n
 - **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage`
    - [x] 随机图片(评级大于6的图将私发)
    - [x] 直接随机(无r18检测，务必小心，仅管理可用)
@@ -265,8 +268,11 @@ print("run[CQ:image,file="+j["img"]+"]")
    - [x] 个人猜单词
    - [x] 团队猜单词
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"`
-    - [x] >vup info [名字 | uid]
-    - [x] >user info [名字 | uid]
+    - [x] >vup info [xxx]
+    - [x] >user info [xxx]
+    - [x] 查成分 [xxx]
+    - [x] 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31
+    - [x] 更新vup
 - **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"`
    - [x] 小作文
    - [x] 发大病
@@ -368,12 +374,12 @@ print("run[CQ:image,file="+j["img"]+"]")
    - api早上8点更新，推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用
    - [x] /启用 zaobao
    - [x] /禁用 zaobao
- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
-    - [x] 舔狗日记
 ```
 记录在"00 9 * * *"触发的指令
 今日早报
 ```
+- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+    - [x] 舔狗日记
 - **TODO...**

 ## 使用方法
--- a/go.mod
+++ b/go.mod
@@ -3,15 +3,15 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18

 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220328090901-d01ce41ecaca
+	github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220328090754-b949b4e868e5
+	github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
 	github.com/fumiama/go-base16384 v1.4.0
-	github.com/fumiama/go-registry v0.1.2
+	github.com/fumiama/go-registry v0.1.3
 	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/sqlite3 v1.14.6
@@ -22,7 +22,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d
 	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
 )

@@ -35,7 +35,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
@@ -46,8 +46,8 @@ require (
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0 // indirect
+	golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
+	golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect
 	golang.org/x/text v0.3.7 // indirect
 	modernc.org/libc v1.14.12 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220328090901-d01ce41ecaca h1:mHrQLnuanvGeqc2EkKrNuBDSUMp8uhlPXBhLuinyMlI=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220328090901-d01ce41ecaca/go.mod h1:EPRv+7KfmYwTq8xeLXpZLqzyjw7692fWE+2InqAn8t0=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc h1:kTdQ6MvYGhVFpXlnAYdWeXAy8pdcpCUEcInT6zVOq+g=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc/go.mod h1:lZmZecNyucV88/1GllxoAh4F41Gy1nLannviQ4ahVWg=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.2-0.20220328090754-b949b4e868e5 h1:qHuSftyvTepeXLdFIBKuAy7Ni9jlNBxXxp03efkqUJY=
-github.com/FloatTech/zbputils v1.3.2-0.20220328090754-b949b4e868e5/go.mod h1:AcOSnCQjZe0jFzAre1YBwUXi/WQIKZXTD4pcsMro+p4=
+github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8 h1:qFMThl7qav2WwRGxNNcD1qviIZhfANW8Y0aXRpnhwMM=
+github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
@@ -33,8 +33,8 @@ github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
 github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
 github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
-github.com/fumiama/go-registry v0.1.2 h1:mlH9QtbgzfV+uvm5YM8YZau/2yrekVziPuyn3UTzrYw=
-github.com/fumiama/go-registry v0.1.2/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
+github.com/fumiama/go-registry v0.1.3 h1:WvUN2wdziB2+LyYs4zNy1FHGQOvZeto7lbADfSqbMPw=
+github.com/fumiama/go-registry v0.1.3/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
 github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
 github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
@@ -72,8 +72,9 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db h1:m2s7Fwo4OwmcheIWUc/Nw9/MZ0eFtP3to0ovTpqOiCQ=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db/go.mod h1:VgrrWVwBO2+6XKn8ypT3WUqvoxCa8R2M5to2tRzGovI=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -122,8 +123,8 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785 h1:alVsiLOu9H0GCriAkTMqn310izMNEzg9y1Z9FqAV1DY=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d h1:NGea1vhhGuvv7E6sPeUyPyTxCtCkEVn8ShNniZY9bQA=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -145,8 +146,8 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc=
+golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -168,8 +169,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0 h1:G6WAvvcMaaFYQhMbC0L5ZWNExEcJ3j3yFTxx4mwOHtM=
-golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -187,8 +188,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
--- a/plugin/bilibili/api.go
+++ b/plugin/bilibili/api.go
@@ -0,0 +1,180 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+)
+
+var (
+	errNeedCookie = errors.New("该api需要设置b站cookie，请发送命令设置cookie，例如\"设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\"")
+)
+
+type searchResult struct {
+	Mid    int64  `json:"mid"`
+	Uname  string `json:"uname"`
+	Gender int64  `json:"gender"`
+	Usign  string `json:"usign"`
+	Level  int64  `json:"level"`
+}
+
+// 搜索api：通过把触发指令传入的昵称找出uid返回
+func search(keyword string) (r []searchResult, err error) {
+	searchURL := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&keyword=" + keyword
+	data, err := web.GetData(searchURL)
+	if err != nil {
+		return
+	}
+	j := gjson.ParseBytes(data)
+	if j.Get("data.numResults").Int() == 0 {
+		err = errors.New("查无此人")
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(j.Get("data.result").Raw), &r)
+	if err != nil {
+		return
+	}
+	return
+}
+
+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) (result follower, err error) {
+	fanURL := "https://api.vtbs.moe/v1/detail/" + uid
+	data, err := web.GetData(fanURL)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &result); err != nil {
+		return
+	}
+	return
+}
+
+func followings(uid string) (s string, err error) {
+	followingURL := "https://api.bilibili.com/x/relation/same/followings?vmid=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, followingURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	json := gjson.ParseBytes(body)
+	s = json.Get("data.list.#.uname").Raw
+	if json.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if json.Get("code").Int() != 0 {
+		err = errors.New(json.Get("message").String())
+		return
+	}
+	return
+}
+
+type userinfo struct {
+	Name       string  `json:"name"`
+	Mid        string  `json:"mid"`
+	Face       string  `json:"face"`
+	Fans       int64   `json:"fans"`
+	Attentions []int64 `json:"attentions"`
+}
+
+type medalInfo struct {
+	Mid              int64  `json:"target_id"`
+	MedalName        string `json:"medal_name"`
+	Level            int64  `json:"level"`
+	MedalColorStart  int64  `json:"medal_color_start"`
+	MedalColorEnd    int64  `json:"medal_color_end"`
+	MedalColorBorder int64  `json:"medal_color_border"`
+}
+type medal struct {
+	Uname     string `json:"target_name"`
+	medalInfo `json:"medal_info"`
+}
+
+type medalSlice []medal
+
+func (m medalSlice) Len() int {
+	return len(m)
+}
+func (m medalSlice) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+func (m medalSlice) Less(i, j int) bool {
+	return m[i].Level > m[j].Level
+}
+
+// 获取详情
+func card(uid string) (result userinfo, err error) {
+	cardURL := "https://account.bilibili.com/api/member/getCardByMid?mid=" + uid
+	data, err := web.GetData(cardURL)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("card").Raw), &result)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// 获得牌子
+func medalwall(uid string) (result []medal, err error) {
+	medalwallURL := "https://api.live.bilibili.com/xlive/web-ucenter/user/MedalWall?target_id=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, medalwallURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	data, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	fmt.Println("medalwall:", binary.BytesToString(data))
+	j := gjson.ParseBytes(data)
+	if j.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if j.Get("code").Int() != 0 {
+		err = errors.New(j.Get("message").String())
+	}
+	_ = json.Unmarshal(binary.StringToBytes(j.Get("data.list").Raw), &result)
+	return
+}
--- a/plugin/bilibili/info.go
+++ b/plugin/bilibili/info.go
@@ -2,64 +2,290 @@
 package bilibili

 import (
-	"io"
-	"net/http"
+	"encoding/binary"
+	"fmt"
+	"image/color"
+	"os"
+	"sort"
+	"strconv"
+	"time"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/tidwall/gjson"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/fogleman/gg"
+	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )

 var engine = control.Register("bilibili", order.AcquirePrio(), &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
-		"- >vup info [名字 | uid]\n" +
-		"- >user info [名字 | uid]",
+		"- >vup info [xxx]\n" +
+		"- >user info [xxx]\n" +
+		"- 查成分 [xxx]\n" +
+		"- 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\n" +
+		"- 更新vup",
+	PublicDataFolder: "Bilibili",
 })

 // 查成分的
 func init() {
-	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
+	cachePath := engine.DataFolder() + "cache/"
+	dbfile := engine.DataFolder() + "bilibili.db"
+	go func() {
+		_ = os.MkdirAll(cachePath, 0755)
+		_, _ = file.GetLazyData(dbfile, false, false)
+		vdb = initialize(dbfile)
+	}()
+
+	engine.OnRegex(`^>user info\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
-			rest, err := uid(keyword)
+			uidRes, err := search(keyword)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
-			id := rest.Get("data.result.0.mid").String()
-			url := "https://api.bilibili.com/x/relation/same/followings?vmid=" + id
-			method := "GET"
-			client := &http.Client{}
-			req, err := http.NewRequest(method, url, nil)
+			id := strconv.FormatInt(uidRes[0].Mid, 10)
+			follwings, err := followings(id)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
-				return
 			}
-			req.Header.Add("cookie", "CURRENT_FNVAL=80; _uuid=772B88E8-3ED1-D589-29BB-F6CB5214239A06137infoc; blackside_state=1; bfe_id=6f285c892d9d3c1f8f020adad8bed553; rpdid=|(umY~Jkl|kJ0J'uYkR|)lu|); fingerprint=0ec2b1140fb30b56d7b5e415bc3b5fb1; buvid_fp=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; buvid_fp_plain=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; SESSDATA=9e0266f6%2C1639637127%2Cb0172%2A61; bili_jct=96ddbd7e22d527abdc0501339a12d4d3; DedeUserID=695737880; DedeUserID__ckMd5=0117660e75db7b01; sid=5labuhaf; PVID=1; bfe_id=1e33d9ad1cb29251013800c68af42315")
-			res, err := client.Do(req)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			defer res.Body.Close()
-
-			body, err := io.ReadAll(res.Body)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			data := string(body)
 			ctx.SendChain(message.Text(
-				"uid: ", rest.Get("data.result.0.mid").Int(), "\n",
-				"name: ", rest.Get("data.result.0.uname").Str, "\n",
-				"sex: ", []string{"", "", "女", "男"}[rest.Get("data.result.0.gender").Int()], "\n",
-				"sign: ", rest.Get("data.result.0.usign").Str, "\n",
-				"level: ", rest.Get("data.result.0.level").Int(), "\n",
-				"follow: ", gjson.Get(data, "data.list.#.uname"),
+				"search: ", uidRes[0].Mid, "\n",
+				"name: ", uidRes[0].Uname, "\n",
+				"sex: ", []string{"", "男", "女", "未知"}[uidRes[0].Gender], "\n",
+				"sign: ", uidRes[0].Usign, "\n",
+				"level: ", uidRes[0].Level, "\n",
+				"follow: ", follwings,
 			))
 		})
+
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			res, err := search(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := strconv.FormatInt(res[0].Mid, 10)
+			// 获取详情
+			fo, err := fansapi(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"search: ", 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"),
+			))
+		})
+
+	engine.OnRegex(`^查成分\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			searchRes, err := search(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := strconv.FormatInt(searchRes[0].Mid, 10)
+			today := time.Now().Format("20060102")
+			drawedFile := cachePath + id + today + "vupLike.png"
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			u, err := card(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vups, err := vdb.filterVup(u.Attentions)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vupLen := len(vups)
+			medals, err := medalwall(id)
+			sort.Sort(medalSlice(medals))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			frontVups := make([]vup, 0)
+			medalMap := make(map[int64]medal)
+			for _, v := range medals {
+				up := vup{
+					Mid:   v.Mid,
+					Uname: v.Uname,
+				}
+				frontVups = append(frontVups, up)
+				medalMap[v.Mid] = v
+			}
+			vups = append(vups, frontVups...)
+			copy(vups[len(frontVups):], vups)
+			copy(vups, frontVups)
+			for i := len(frontVups); i < len(vups); i++ {
+				if _, ok := medalMap[vups[i].Mid]; ok {
+					vups = append(vups[:i], vups[i+1:]...)
+					i--
+				}
+			}
+			facePath := cachePath + id + "vupFace.png"
+			initFacePic(facePath, u.Face)
+			var backX int
+			var backY int
+			back, err := gg.LoadImage(facePath)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				backX = 500
+				backY = 500
+			} else {
+				back = img.Limit(back, 500, 500)
+				backX = back.Bounds().Size().X
+				backY = back.Bounds().Size().Y
+			}
+			if len(vups) > 50 {
+				ctx.SendChain(message.Text(u.Name + "关注的up主太多了，只展示前50个up"))
+				vups = vups[:50]
+			}
+			canvas := gg.NewContext(backX*3, int(float64(backY)*(1.1+float64(len(vups))/3)))
+			fontSize := float64(backX) * 0.1
+			canvas.SetColor(color.White)
+			canvas.Clear()
+			if back != nil {
+				canvas.DrawImage(back, 0, 0)
+			}
+			canvas.SetColor(color.Black)
+			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			sl, _ := canvas.MeasureString("好")
+			length, h := canvas.MeasureString(u.Mid)
+			n, _ := canvas.MeasureString(u.Name)
+			canvas.DrawString(u.Name, float64(backX)*1.1, float64(backY)/3-h)
+			canvas.DrawRoundedRectangle(float64(backX)*1.2+n-length*0.1, float64(backY)/3-h*2.5, length*1.2, h*2, fontSize*0.2)
+			canvas.SetRGB255(221, 221, 221)
+			canvas.Fill()
+			canvas.SetColor(color.Black)
+			canvas.DrawString(u.Mid, float64(backX)*1.2+n, float64(backY)/3-h)
+			canvas.DrawString(fmt.Sprintf("粉丝：%d", u.Fans), float64(backX)*1.1, float64(backY)/3*2-2.5*h)
+			canvas.DrawString(fmt.Sprintf("关注：%d", len(u.Attentions)), float64(backX)*2, float64(backY)/3*2-2.5*h)
+			canvas.DrawString(fmt.Sprintf("管人痴成分：%.2f%%（%d/%d）", float64(vupLen)/float64(len(u.Attentions))*100, vupLen, len(u.Attentions)), float64(backX)*1.1, float64(backY)-4*h)
+			canvas.DrawString("日期："+time.Now().Format("2006-01-02"), float64(backX)*1.1, float64(backY)-h)
+			for i, v := range vups {
+				if i%2 == 1 {
+					canvas.SetRGB255(245, 245, 245)
+					canvas.DrawRectangle(0, float64(backY)*1.1+float64(i)*float64(backY)/3, float64(backX*3), float64(backY)/3)
+					canvas.Fill()
+				}
+				canvas.SetColor(color.Black)
+				nl, _ := canvas.MeasureString(v.Uname)
+				canvas.DrawString(v.Uname, float64(backX)*0.1, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				ml, _ := canvas.MeasureString(strconv.FormatInt(v.Mid, 10))
+				canvas.DrawRoundedRectangle(nl-0.1*ml+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-h*3.5, ml*1.2, h*2, fontSize*0.2)
+				canvas.SetRGB255(221, 221, 221)
+				canvas.Fill()
+				canvas.SetColor(color.Black)
+				canvas.DrawString(strconv.FormatInt(v.Mid, 10), nl+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				if m, ok := medalMap[v.Mid]; ok {
+					mnl, _ := canvas.MeasureString(m.MedalName)
+					grad := gg.NewLinearGradient(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h, nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					r, g, b := int2rbg(m.MedalColorStart)
+					grad.AddColorStop(0, color.RGBA{uint8(r), uint8(g), uint8(b), 255})
+					r, g, b = int2rbg(m.MedalColorEnd)
+					grad.AddColorStop(1, color.RGBA{uint8(r), uint8(g), uint8(b), 255})
+					canvas.SetFillStyle(grad)
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Fill()
+					canvas.SetColor(color.White)
+					canvas.DrawString(m.MedalName, nl+ml+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					r, g, b = int2rbg(m.MedalColorBorder)
+					canvas.SetRGB255(int(r), int(g), int(b))
+					canvas.DrawString(strconv.FormatInt(m.Level, 10), nl+ml+mnl+sl+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					mll, _ := canvas.MeasureString(strconv.FormatInt(m.Level, 10))
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Stroke()
+				}
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				log.Errorln("[bilibili]", err)
+				data, cl := writer.ToBytes(canvas.Image())
+				ctx.SendChain(message.ImageBytes(data))
+				cl()
+				return
+			}
+			_, err = writer.WriteTo(canvas.Image(), f)
+			_ = f.Close()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
+
+	engine.OnRegex(`^设置b站cookie?\s+(.{1,100})$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			cookie := ctx.State["regex_matched"].([]string)[1]
+			err := vdb.setBilibiliCookie(cookie)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("成功设置b站cookie为" + cookie))
+		})
+
+	engine.OnFullMatch("更新vup", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			updateVup()
+			ctx.SendChain(message.Text("vup已更新"))
+		})
+}
+
+func initFacePic(filename, faceURL string) {
+	if file.IsNotExist(filename) {
+		data, err := web.GetData(faceURL)
+		if err != nil {
+			log.Errorln("[bilibili]", err)
+		}
+		err = os.WriteFile(filename, data, 0666)
+		if err != nil {
+			log.Errorln("[bilibili]", err)
+		}
+	}
+}
+
+func int2rbg(t int64) (int64, int64, int64) {
+	var buf [8]byte
+	binary.LittleEndian.PutUint64(buf[:], uint64(t))
+	b, g, r := int64(buf[0]), int64(buf[1]), int64(buf[2])
+	return r, g, b
 }
--- a/plugin/bilibili/live_info.go
+++ b/plugin/bilibili/live_info.go
@@ -1,85 +0,0 @@
-package bilibili
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/FloatTech/zbputils/web"
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-// 查vup粉丝数据
-func init() {
-	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			keyword := ctx.State["regex_matched"].([]string)[1]
-			res, err := uid(keyword)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			id := res.Get("data.result.0.mid").String()
-			// 获取详情
-			fo, err := fansapi(id)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				return
-			}
-			ctx.SendChain(message.Text(
-				"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) {
-	api := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&&user_type=1&keyword=" + keyword
-	data, err := web.GetData(api)
-	if err != nil {
-		return nil, err
-	}
-	json := gjson.ParseBytes(data)
-	if json.Get("data.numResults").Int() == 0 {
-		return nil, errors.New("查无此人")
-	}
-	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
-}
--- a/plugin/bilibili/model.go
+++ b/plugin/bilibili/model.go
@@ -0,0 +1,130 @@
+package bilibili
+
+import (
+	"os"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	_ "github.com/fumiama/sqlite3" // use sql
+	"github.com/jinzhu/gorm"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+)
+
+const (
+	bilibiliCookie = "bilbili_cookie"
+)
+
+var (
+	vtbURLs = [...]string{"https://api.vtbs.moe/v1/short", "https://api.tokyo.vtbs.moe/v1/short", "https://vtbs.musedash.moe/v1/short"}
+	vdb     *vupdb
+)
+
+// vupdb 分数数据库
+type vupdb gorm.DB
+
+type vup struct {
+	Mid    int64  `gorm:"column:mid;primary_key"`
+	Uname  string `gorm:"column:uname"`
+	Roomid int64  `gorm:"column:roomid"`
+}
+
+func (vup) TableName() string {
+	return "vup"
+}
+
+type config struct {
+	Key   string `gorm:"column:key;primary_key"`
+	Value string `gorm:"column:value"`
+}
+
+func (config) TableName() string {
+	return "config"
+}
+
+// initialize 初始化vtb数据库
+func initialize(dbpath string) *vupdb {
+	if _, err := os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		panic(err)
+	}
+	gdb.Debug().AutoMigrate(&vup{}).AutoMigrate(&config{})
+	return (*vupdb)(gdb)
+}
+
+func (vdb *vupdb) insertVupByMid(mid int64, uname string, roomid int64) (err error) {
+	db := (*gorm.DB)(vdb)
+	v := vup{
+		Mid:    mid,
+		Uname:  uname,
+		Roomid: roomid,
+	}
+	if err = db.Debug().Model(&vup{}).First(&v, "mid = ? ", mid).Error; err != nil {
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&vup{}).Create(&v).Error
+		}
+	}
+	return
+}
+
+// filterVup 筛选vup
+func (vdb *vupdb) filterVup(ids []int64) (vups []vup, err error) {
+	db := (*gorm.DB)(vdb)
+	if err = db.Debug().Model(&vup{}).Find(&vups, "mid in (?)", ids).Error; err != nil {
+		return vups, err
+	}
+	return
+}
+
+func updateVup() {
+	for _, v := range vtbURLs {
+		data, err := web.GetData(v)
+		if err != nil {
+			log.Errorln("[bilibili]:", err)
+		}
+		gjson.Get(binary.BytesToString(data), "@this").ForEach(func(key, value gjson.Result) bool {
+			mid := value.Get("mid").Int()
+			uname := value.Get("uname").String()
+			roomid := value.Get("roomid").Int()
+			err = vdb.insertVupByMid(mid, uname, roomid)
+			if err != nil {
+				log.Errorln("[bilibili]:", err)
+			}
+			return true
+		})
+	}
+}
+
+func (vdb *vupdb) setBilibiliCookie(cookie string) (err error) {
+	db := (*gorm.DB)(vdb)
+	c := config{
+		Key:   bilibiliCookie,
+		Value: cookie,
+	}
+	if err = db.Debug().Model(&config{}).First(&c, "key = ? ", bilibiliCookie).Error; err != nil {
+		// error handling...
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&config{}).Create(&c).Error
+		}
+	} else {
+		err = db.Debug().Model(&config{}).Where("key = ? ", bilibiliCookie).Update(
+			map[string]interface{}{
+				"value": cookie,
+			}).Error
+	}
+	return
+}
+
+func (vdb *vupdb) getBilibiliCookie() (c config) {
+	db := (*gorm.DB)(vdb)
+	db.Debug().Model(&config{}).First(&c, "key = ?", bilibiliCookie)
+	return
+}
--- a/plugin/bilibili_push/bilibili_push.go
+++ b/plugin/bilibili_push/bilibili_push.go
@@ -5,8 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"strconv"
 	"time"

@@ -300,20 +298,7 @@ func getLiveList(uids ...int64) string {
 	m := make(map[string]interface{})
 	m["uids"] = uids
 	b, _ := json.Marshal(m)
-	client := &http.Client{}
-	// 提交请求
-	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	request.Header.Add("Referer", referer)
-	request.Header.Add("User-Agent", ua)
-	response, err := client.Do(request)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	defer response.Body.Close()
-	data, err := io.ReadAll(response.Body)
+	data, err := web.PostData(liveListURL, "application/json", bytes.NewReader(b))
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
--- a/plugin/hyaku/main.go
+++ b/plugin/hyaku/main.go
@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"reflect"
 	"strconv"
 	"unsafe"

+	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -18,8 +20,32 @@ import (

 const bed = "https://gitcode.net/u011570312/OguraHyakuninIsshu/-/raw/master/"

+//nolint: asciicheck
 type line struct {
-	no, 歌人, 上の句, 下の句, 上の句ひらがな, 下の句ひらがな string
+	番号, 歌人, 上の句, 下の句, 上の句ひらがな, 下の句ひらがな string
+}
+
+func (l *line) String() string {
+	b := binary.NewWriterF(func(w *binary.Writer) {
+		r := reflect.ValueOf(l).Elem().Type()
+		for i := 0; i < r.NumField(); i++ {
+			switch i {
+			case 0:
+				w.WriteString("●")
+			case 1:
+				w.WriteString("◉")
+			case 2, 3:
+				w.WriteString("○")
+			case 4, 5:
+				w.WriteString("◎")
+			}
+			w.WriteString(r.Field(i).Name)
+			w.WriteString("：")
+			w.WriteString((*[6]string)(unsafe.Pointer(l))[i])
+			w.WriteString("\n")
+		}
+	})
+	return binary.BytesToString(b)
 }

 var lines [100]*line
@@ -49,11 +75,15 @@ func init() {
 		if err != nil {
 			panic(err)
 		}
+		_ = f.Close()
 		records = records[1:] // skip title
 		if len(records) != 100 {
 			panic("invalid csvfile")
 		}
 		for j, r := range records {
+			if len(r) != 6 {
+				panic("invalid csvfile")
+			}
 			i, err := strconv.Atoi(r[0])
 			if err != nil {
 				panic(err)
@@ -69,14 +99,7 @@ func init() {
 		i := rand.Intn(100)
 		ctx.SendChain(
 			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i+1)),
-			message.Text("\n",
-				"●番　号: ", lines[i].no, "\n",
-				"●歌　人: ", lines[i].歌人, "\n",
-				"●上の句: ", lines[i].上の句, "\n",
-				"●下の句: ", lines[i].下の句, "\n",
-				"●上の句ひらがな: ", lines[i].上の句ひらがな, "\n",
-				"●下の句ひらがな: ", lines[i].下の句ひらがな, "\n",
-			),
+			message.Text("\n", lines[i]),
 			message.Image(fmt.Sprintf(bed+"img/%03d.png", i+1)),
 		)
 	})
@@ -90,18 +113,10 @@ func init() {
 			ctx.SendChain(message.Text("ERROR:超出范围"))
 			return
 		}
-		i--
 		ctx.SendChain(
-			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i+1)),
-			message.Text("\n",
-				"●番　号: ", lines[i].no, "\n",
-				"●歌　人: ", lines[i].歌人, "\n",
-				"●上の句: ", lines[i].上の句, "\n",
-				"●下の句: ", lines[i].下の句, "\n",
-				"●上の句ひらがな: ", lines[i].上の句ひらがな, "\n",
-				"●下の句ひらがな: ", lines[i].下の句ひらがな, "\n",
-			),
-			message.Image(fmt.Sprintf(bed+"img/%03d.png", i+1)),
+			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i)),
+			message.Text("\n", lines[i-1]),
+			message.Image(fmt.Sprintf(bed+"img/%03d.png", i)),
 		)
 	})
 }
--- a/plugin/nsfw/main.go
+++ b/plugin/nsfw/main.go
@@ -12,6 +12,8 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 )

+const hso = "https://gchat.qpic.cn/gchatpic_new//--4234EDEC5F147A4C319A41149D7E0EA9/0"
+
 func init() {
 	engine := control.Register("nsfw", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
@@ -31,11 +33,10 @@ func init() {
 				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
 			}
 		})
-	en := control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
+	control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
-	})
-	en.OnMessage(zero.IsPicExists).SetBlock(false).
+	}).OnMessage(zero.HasPicture).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -96,6 +97,6 @@ func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
 		i++
 	}
 	if i > 0 {
-		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c)))
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c, "\n"), message.Image(hso)))
 	}
 }
Author	SHA1	Message	Date
源文雨	8e4c496b54	🐛 MustProvicePicture goroutine 泄漏	2022-03-30 13:23:52 +08:00
源文雨	27054b9722	🐛 MustProvicePicture goroutine 泄漏	2022-03-30 13:17:37 +08:00
源文雨	bcad2c4998	🎨 优化代码结构	2022-03-29 16:29:29 +08:00
github-actions[bot]	aae2bd4884	🎨 改进代码样式	2022-03-29 05:05:36 +00:00
himawari	006ef6f672	👍 添加查成分功能，修改bilibili插件的正则 (#171 ) * :sparkles:添加查成分功能 * :rotating_light:修lint * :rotating_light:减少空格 * :bug:修改网址 * :bug:修改vup数量错误问题 * :bug:图片读取不了,就不读了 * 🐛 固定头像大小，bilibilipush调公有库 * 🎨 修改json转换 Co-authored-by: Guohuiyuan <haibaraguo@yeahka.com>	2022-03-29 13:03:46 +08:00
源文雨	7be1a61347	🎨 优化代码结构	2022-03-28 23:13:53 +08:00
源文雨	1ef48f6cd6	🎨 优化代码结构	2022-03-28 23:06:04 +08:00
源文雨	a9a061a4bb	🎨 优化代码结构	2022-03-28 23:01:36 +08:00
源文雨	14ed8b7af7	🐛 reg	2022-03-28 17:23:54 +08:00
源文雨	d17b8fa720	📝 edit readme	2022-03-28 17:14:39 +08:00