From dc5ec8fb7a24c5b2fd72952ed8c043e9e1d5fea2 Mon Sep 17 00:00:00 2001 From: qydysky Date: Wed, 5 Jun 2024 12:38:55 +0000 Subject: [PATCH] Fix api GetWearedMedal 405 --- F/api.go | 8 ++++---- F/biliApiInterface.go | 2 +- Reply/F.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/F/api.go b/F/api.go index 6511241b3d..9fd869f9a3 100644 --- a/F/api.go +++ b/F/api.go @@ -1104,9 +1104,9 @@ func Get_list_in_room(RoomID, TargetID int) (array []struct { } // 获取当前佩戴的牌子 -func Get_weared_medal() (item J.GetWearedMedal_Data) { +func Get_weared_medal(uid, upUid int) (item J.GetWearedMedal_Data) { - apilog := apilog.Base_add(`获取牌子`) + apilog := apilog.Base_add(`获取佩戴牌子`) //验证cookie if missKey := CookieCheck([]string{ `bili_jct`, @@ -1117,7 +1117,7 @@ func Get_weared_medal() (item J.GetWearedMedal_Data) { return } - if err, res := biliApi.GetWearedMedal(); err != nil { + if err, res := biliApi.GetWearedMedal(uid, upUid); err != nil { apilog.L(`E: `, err) } else { item.Roominfo.RoomID = res.RoomID @@ -1156,7 +1156,7 @@ func (c *GetFunc) CheckSwitch_FansMedal() (missKey []string) { return true }) { //获取当前牌子,验证是否本直播间牌子 - res := Get_weared_medal() + res := Get_weared_medal(c.Uid, c.UpUid) c.Wearing_FansMedal = res.Roominfo.RoomID //更新佩戴信息 if res.TargetID == c.UpUid { diff --git a/F/biliApiInterface.go b/F/biliApiInterface.go index 0d953eedf7..b3942fdf9f 100644 --- a/F/biliApiInterface.go +++ b/F/biliApiInterface.go @@ -86,7 +86,7 @@ type biliApiInter interface { ImgURL string SubURL string }) (err error, queryEnc string) - GetWearedMedal() (err error, res struct { + GetWearedMedal(uid, upUid int) (err error, res struct { TodayIntimacy int RoomID int TargetID int diff --git a/Reply/F.go b/Reply/F.go index 282abeaacc..1c94762422 100644 --- a/Reply/F.go +++ b/Reply/F.go @@ -981,7 +981,7 @@ func Entry_danmu() { return } if v, _ := c.C.K_v.LoadV(`进房弹幕_仅发首日弹幕`).(bool); v { - res := F.Get_weared_medal() + res := F.Get_weared_medal(c.C.Uid, c.C.UpUid) if res.TodayIntimacy > 0 { flog.L(`T: `, `今日已发弹幕`) return diff --git a/go.mod b/go.mod index 8425a9a37d..ead6d281b8 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( require ( github.com/google/uuid v1.6.0 - github.com/qydysky/biliApi v0.0.0-20240513191013-9035390b13c0 + github.com/qydysky/biliApi v0.0.0-20240605123327-461cdf520458 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 ) diff --git a/go.sum b/go.sum index 65357edfa0..769818e444 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/qydysky/biliApi v0.0.0-20240513191013-9035390b13c0 h1:mPP9ElJlVbXG7st/11LrIRw8zF8lEzagalzO4Nz9EHM= -github.com/qydysky/biliApi v0.0.0-20240513191013-9035390b13c0/go.mod h1:om024vfxALQ5vxsbaGoMm8IS0esLYBnEOpJI8FsGoDg= +github.com/qydysky/biliApi v0.0.0-20240605123327-461cdf520458 h1:dZ3W6FNonYAvduyjaaBW/1cYyZSblunkbRUv+oO5nJU= +github.com/qydysky/biliApi v0.0.0-20240605123327-461cdf520458/go.mod h1:om024vfxALQ5vxsbaGoMm8IS0esLYBnEOpJI8FsGoDg= github.com/qydysky/part v0.28.20240522125924 h1:l1FuWfh8tQpfOIfnI2LJsoBDfMdrseh27wquWj1nq+Y= github.com/qydysky/part v0.28.20240522125924/go.mod h1:nZgAUD7e70EN+Zxe1pie3J4j0/d8dr0/y4AiZJwcsbo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=