Skip to content

Commit

Permalink
添加两个接口：用户名片信息 获取视频合集信息 (#35)
Browse files Browse the repository at this point in the history 
* fix draw size int to float64

* 添加GetUserCard GetArchivesList
  • Loading branch information
@yangtfu
yangtfu authored Mar 27, 2024
1 parent bb5cd96 commit 42978e5
Show file tree
Hide file tree
Showing 3 changed files with 198 additions and 7 deletions.
7 changes: 4 additions & 3 deletions dynamic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package bilibili

import (
"encoding/json"
"github.com/pkg/errors"
"github.com/tidwall/gjson"
"io"
"strconv"
"strings"

"github.com/pkg/errors"
"github.com/tidwall/gjson"
)

type SearchDynamicAtResult struct {
Expand Down Expand Up @@ -1094,7 +1095,7 @@ func GetUserSpaceDynamic(mid int, offset string) (*DynamicInfo, error) {
return std.GetUserSpaceDynamic(mid, offset)
}
func (c *Client) GetUserSpaceDynamic(mid int, offset string) (*DynamicInfo, error) {
r := c.resty().R().SetHeader("Content-Type", "application/x-www-form-urlencoded").SetQueryParam("host_mid", strconv.Itoa(mid))
r := c.resty().R().SetHeader("Content-Type", "application/x-www-form-urlencoded").SetHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36 Edg/122.0.0.0").SetQueryParam("host_mid", strconv.Itoa(mid))
if len(offset) > 0 {
r = r.SetQueryParam("offset", offset)
}
Expand Down
127 changes: 126 additions & 1 deletion user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package bilibili

import (
"encoding/json"
"github.com/pkg/errors"
"strconv"

"github.com/pkg/errors"
)

type OrderType string
Expand Down Expand Up @@ -56,6 +57,109 @@ type GetUserVideosResult struct {
} `json:"episodic_button"`
}

type UserCardResult struct {
Card struct {
Mid string `json:"mid"`
Name string `json:"name"`
Approve bool `json:"approve"`
Sex string `json:"sex"`
Rank string `json:"rank"`
Face string `json:"face"`
FaceNft int `json:"face_nft"`
FaceNftType int `json:"face_nft_type"`
DisplayRank string `json:"DisplayRank"`
Regtime int `json:"regtime"`
Spacesta int `json:"spacesta"`
Birthday string `json:"birthday"`
Place string `json:"place"`
Description string `json:"description"`
Article int `json:"article"`
Attentions []interface{} `json:"attentions"`
Fans int `json:"fans"`
Friend int `json:"friend"`
Attention int `json:"attention"`
Sign string `json:"sign"`
LevelInfo struct {
CurrentLevel int `json:"current_level"`
CurrentMin int `json:"current_min"`
CurrentExp int `json:"current_exp"`
NextExp int `json:"next_exp"`
} `json:"level_info"`
Pendant struct {
Pid int `json:"pid"`
Name string `json:"name"`
Image string `json:"image"`
Expire int `json:"expire"`
ImageEnhance string `json:"image_enhance"`
ImageEnhanceFrame string `json:"image_enhance_frame"`
NPid int `json:"n_pid"`
} `json:"pendant"`
Nameplate struct {
Nid int `json:"nid"`
Name string `json:"name"`
Image string `json:"image"`
ImageSmall string `json:"image_small"`
Level string `json:"level"`
Condition string `json:"condition"`
} `json:"nameplate"`
Official struct {
Role int `json:"role"`
Title string `json:"title"`
Desc string `json:"desc"`
Type int `json:"type"`
} `json:"Official"`
OfficialVerify struct {
Type int `json:"type"`
Desc string `json:"desc"`
} `json:"official_verify"`
Vip struct {
Type int `json:"type"`
Status int `json:"status"`
DueDate int64 `json:"due_date"`
VipPayType int `json:"vip_pay_type"`
ThemeType int `json:"theme_type"`
Label struct {
Path string `json:"path"`
Text string `json:"text"`
LabelTheme string `json:"label_theme"`
TextColor string `json:"text_color"`
BgStyle int `json:"bg_style"`
BgColor string `json:"bg_color"`
BorderColor string `json:"border_color"`
UseImgLabel bool `json:"use_img_label"`
ImgLabelURIHans string `json:"img_label_uri_hans"`
ImgLabelURIHant string `json:"img_label_uri_hant"`
ImgLabelURIHansStatic string `json:"img_label_uri_hans_static"`
ImgLabelURIHantStatic string `json:"img_label_uri_hant_static"`
} `json:"label"`
AvatarSubscript int `json:"avatar_subscript"`
NicknameColor string `json:"nickname_color"`
Role int `json:"role"`
AvatarSubscriptURL string `json:"avatar_subscript_url"`
TvVipStatus int `json:"tv_vip_status"`
TvVipPayType int `json:"tv_vip_pay_type"`
TvDueDate int `json:"tv_due_date"`
AvatarIcon struct {
IconType int `json:"icon_type"`
IconResource struct {
} `json:"icon_resource"`
} `json:"avatar_icon"`
VipType int `json:"vipType"`
VipStatus int `json:"vipStatus"`
} `json:"vip"`
IsSeniorMember int `json:"is_senior_member"`
} `json:"card"`
Space *struct {
SImg string `json:"s_img,omitempty"`
LImg string `json:"l_img,omitempty"`
} `json:"space,omitempty"`
Following bool `json:"following"`
ArchiveCount int `json:"archive_count"`
ArticleCount int `json:"article_count"`
Follower int `json:"follower"`
LikeNum int `json:"like_num"`
}

// GetUserVideos 获取用户投稿视频明细
func GetUserVideos(mid int, order OrderType, tid int, keyword string, pn int, ps int) (*GetUserVideosResult, error) {
return std.GetUserVideos(mid, order, tid, keyword, pn, ps)
Expand Down Expand Up @@ -87,3 +191,24 @@ func (c *Client) GetUserVideos(mid int, order OrderType, tid int, keyword string
err = json.Unmarshal(data, &ret)
return ret, errors.WithStack(err)
}

// GetUserCard 获取用户用户名片 免登录
// https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/user/info.md#%E7%94%A8%E6%88%B7%E5%90%8D%E7%89%87%E4%BF%A1%E6%81%AF
func GetUserCard(mid int, photo bool) (*UserCardResult, error) {
return std.GetUserCard(mid, photo)
}
func (c *Client) GetUserCard(mid int, photo bool) (*UserCardResult, error) {
r := c.resty().R().SetQueryParam("mid", strconv.Itoa(mid)).SetQueryParam("photo", strconv.FormatBool(photo))

resp, err := r.Get("https://api.bilibili.com/x/web-interface/card")
if err != nil {
return nil, errors.WithStack(err)
}
data, err := getRespData(resp, "获取用户名片")
if err != nil {
return nil, err
}
var ret *UserCardResult
err = json.Unmarshal(data, &ret)
return ret, errors.WithStack(err)
}
71 changes: 68 additions & 3 deletions video.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package bilibili

import (
"encoding/json"
"github.com/go-resty/resty/v2"
"github.com/pkg/errors"
"github.com/tidwall/gjson"
"regexp"
"strconv"
"strings"

"github.com/go-resty/resty/v2"
"github.com/pkg/errors"
"github.com/tidwall/gjson"
)

var regBv = regexp.MustCompile(`(?i)bv([\dA-Za-z]{10})`)
Expand Down Expand Up @@ -1150,3 +1151,67 @@ func (c *Client) GetTopRecommendVideo(freshType, ps int) ([]*VideoInfo, error) {
err = json.Unmarshal(data, &mixedRet)
return mixedRet.Item, errors.WithStack(err)
}

type ArchivesList struct {
Aids []int `json:"aids"`
Archives []struct {
Aid int `json:"aid"`
Bvid string `json:"bvid"`
Ctime int `json:"ctime"`
Duration int `json:"duration"`
EnableVt bool `json:"enable_vt"`
InteractiveVideo bool `json:"interactive_video"`
Pic string `json:"pic"`
PlaybackPosition int `json:"playback_position"`
Pubdate int `json:"pubdate"`
Stat struct {
View int `json:"view"`
Vt int `json:"vt"`
} `json:"stat"`
State int `json:"state"`
Title string `json:"title"`
UgcPay int `json:"ugc_pay"`
VtDisplay string `json:"vt_display"`
} `json:"archives"`
Meta struct {
Category int `json:"category"`
Cover string `json:"cover"`
Description string `json:"description"`
Mid int `json:"mid"`
Name string `json:"name"`
Ptime int `json:"ptime"`
SeasonID int `json:"season_id"`
Total int `json:"total"`
} `json:"meta"`
Page struct {
PageNum int `json:"page_num"`
PageSize int `json:"page_size"`
Total int `json:"total"`
} `json:"page"`
}

// GetArchivesList 获取视频合集信息 https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/collection.md#%E8%8E%B7%E5%8F%96%E8%A7%86%E9%A2%91%E5%90%88%E9%9B%86%E4%BF%A1%E6%81%AF
func GetArchivesList(mid int, sid int, pn int, ps int, sort_reverse bool) (*ArchivesList, error) {
return std.GetArchivesList(mid, sid, pn, ps, sort_reverse)
}
func (c *Client) GetArchivesList(mid int, sid int, pn int, ps int, sort_reverse bool) (*ArchivesList, error) {
postData := map[string]string{
"mid": strconv.Itoa(mid),
"page_num": strconv.Itoa(pn),
"page_size": strconv.Itoa(ps),
"season_id": strconv.Itoa(sid),
"sort_reverse": strconv.FormatBool(sort_reverse),
}
resp, err := c.resty().R().SetQueryParams(postData).Get("https://api.bilibili.com/x/polymer/web-space/seasons_archives_list")
if err != nil {
return nil, errors.WithStack(err)
}

var ret *ArchivesList
data, err := getRespData(resp, "获取合集信息")
if err != nil {
return nil, err
}
err = json.Unmarshal(data, &ret)
return ret, errors.WithStack(err)
}

0 comments on commit 42978e5

Please sign in to comment.