@@ -11,6 +11,7 @@ import (
1111 "github.com/FloatTech/floatbox/binary"
1212 "github.com/FloatTech/floatbox/web"
1313 "github.com/tidwall/gjson"
14+ "github.com/wdvxdr1123/ZeroBot/message"
1415)
1516
1617// ErrAPINeedCookie ...
@@ -20,15 +21,15 @@ var ErrAPINeedCookie = errors.New("api need cookie")
2021var Ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
2122
2223// SearchUser 查找b站用户
23- func SearchUser ( cookiecfg * CookieConfig , keyword string ) (r []SearchResult , err error ) {
24+ func ( cfg * CookieConfig ) SearchUser ( keyword string ) (r []SearchResult , err error ) {
2425 client := & http.Client {}
2526 req , err := http .NewRequest ("GET" , fmt .Sprintf (SearchUserURL , keyword ), nil )
2627 if err != nil {
2728 return
2829 }
29- if cookiecfg != nil {
30+ if cfg != nil {
3031 cookie := ""
31- cookie , err = cookiecfg .Load ()
32+ cookie , err = cfg .Load ()
3233 if err != nil {
3334 return
3435 }
@@ -76,12 +77,12 @@ func LoadDynamicDetail(str string) (card DynamicCard, err error) {
7677}
7778
7879// GetDynamicDetail 用动态id查动态信息
79- func GetDynamicDetail ( cookiecfg * CookieConfig , dynamicIDStr string ) (card DynamicCard , err error ) {
80+ func ( cfg * CookieConfig ) GetDynamicDetail ( dynamicIDStr string ) (card DynamicCard , err error ) {
8081 var data []byte
8182 data , err = web .RequestDataWithHeaders (web .NewDefaultClient (), fmt .Sprintf (DynamicDetailURL , dynamicIDStr ), "GET" , func (req * http.Request ) error {
82- if cookiecfg != nil {
83+ if cfg != nil {
8384 cookie := ""
84- cookie , err = cookiecfg .Load ()
85+ cookie , err = cfg .Load ()
8586 if err != nil {
8687 return err
8788 }
@@ -107,15 +108,15 @@ func GetMemberCard(uid any) (result MemberCard, err error) {
107108}
108109
109110// GetMedalWall 用b站uid获得牌子
110- func GetMedalWall ( cookiecfg * CookieConfig , uid string ) (result []Medal , err error ) {
111+ func ( cfg * CookieConfig ) GetMedalWall ( uid string ) (result []Medal , err error ) {
111112 client := & http.Client {}
112113 req , err := http .NewRequest ("GET" , fmt .Sprintf (MedalWallURL , uid ), nil )
113114 if err != nil {
114115 return
115116 }
116- if cookiecfg != nil {
117+ if cfg != nil {
117118 cookie := ""
118- cookie , err = cookiecfg .Load ()
119+ cookie , err = cfg .Load ()
119120 if err != nil {
120121 return
121122 }
@@ -199,12 +200,12 @@ func GetVideoInfo(id string) (card Card, err error) {
199200 if err != nil {
200201 return
201202 }
202- err = json .Unmarshal (binary .StringToBytes (gjson .ParseBytes (data ).Get ( "data" ). Raw ), & card )
203+ err = json .Unmarshal (binary .StringToBytes (gjson .ParseBytes (data ).Raw ), & card )
203204 return
204205}
205206
206207// GetVideoSummary 用av或bv查看AI视频总结
207- func GetVideoSummary ( cookiecfg * CookieConfig , id string ) (videoSummary VideoSummary , err error ) {
208+ func ( cfg * CookieConfig ) GetVideoSummary ( id string ) (videoSummary VideoSummary , err error ) {
208209 var (
209210 data []byte
210211 card Card
@@ -223,9 +224,9 @@ func GetVideoSummary(cookiecfg *CookieConfig, id string) (videoSummary VideoSumm
223224 return
224225 }
225226 data , err = web .RequestDataWithHeaders (web .NewDefaultClient (), SignURL (fmt .Sprintf (VideoSummaryURL , card .BvID , card .CID , card .Owner .Mid )), "GET" , func (req * http.Request ) error {
226- if cookiecfg != nil {
227+ if cfg != nil {
227228 cookie := ""
228- cookie , err = cookiecfg .Load ()
229+ cookie , err = cfg .Load ()
229230 if err != nil {
230231 return err
231232 }
@@ -240,3 +241,12 @@ func GetVideoSummary(cookiecfg *CookieConfig, id string) (videoSummary VideoSumm
240241 err = json .Unmarshal (data , & videoSummary )
241242 return
242243}
244+
245+ // GetDetailMessage 用动态id查动态信息
246+ func (cfg * CookieConfig ) GetDetailMessage (dynamicIDStr string ) (msg []message.Segment , err error ) {
247+ dyc , err := cfg .GetDynamicDetail (dynamicIDStr )
248+ if err != nil {
249+ return
250+ }
251+ return dyc .ToMessage ()
252+ }
0 commit comments