replace get_user_info with get_user_card

This commit is contained in:
Cinte 2022-09-17 10:58:58 +08:00
parent 0ea740aa7c
commit ec448cfdfb
2 changed files with 11 additions and 7 deletions

View File

@ -7,7 +7,7 @@ from asyncio.exceptions import TimeoutError
from utils.utils import get_bot
from .model import BilibiliSub
from bilireq.live import get_room_info_by_id
from .utils import get_meta
from .utils import get_meta, get_user_card
from utils.message_builder import image
from bilireq.user import get_user_info
from bilireq import dynamic
@ -83,7 +83,7 @@ async def add_up_sub(uid: int, sub_user: str) -> str:
async with db.transaction():
try:
"""bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
user_info = await get_user_info(uid)
user_info = await get_user_card(uid)
except ResponseCodeError:
return f"未找到UpId{uid} 的信息请检查Id是否正确"
uname = user_info["name"]
@ -249,7 +249,7 @@ async def _get_up_status(id_: int) -> Optional[str]:
"""
_user = await BilibiliSub.get_sub(id_)
"""bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
user_info = await get_user_info(_user.uid)
user_info = await get_user_card(_user.uid)
uname = user_info["name"]
"""bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
video_info = await get_videos(_user.uid)

View File

@ -8,7 +8,7 @@ from io import BytesIO
BORDER_PATH = IMAGE_PATH / "border"
BORDER_PATH.mkdir(parents=True, exist_ok=True)
BASE_URL = "https://api.bilibili.com"
async def get_pic(url: str) -> bytes:
"""
@ -78,7 +78,6 @@ async def get_meta(media_id: int, auth=None, reqtype="both", **kwargs):
"""
from bilireq.utils import get
BASE_URL = "https://api.bilibili.com"
url = f"{BASE_URL}/pgc/review/user"
params = {"media_id": media_id}
raw_json = await get(url, raw=True, params=params, auth=auth, reqtype=reqtype, **kwargs)
@ -101,7 +100,6 @@ async def get_videos(
:param order: 排序方式可以为 pubdate(上传日期从新到旧), stow(收藏从多到少), click(播放量从多到少)
"""
from bilireq.utils import get
BASE_URL = "https://api.bilibili.com"
url = f"{BASE_URL}/x/space/arc/search"
params = {
"mid": uid,
@ -111,4 +109,10 @@ async def get_videos(
"keyword": keyword,
"order": order
}
return await get(url, params=params, auth=auth, reqtype=reqtype, **kwargs)
return await get(url, params=params, auth=auth, reqtype=reqtype, **kwargs)
async def get_user_card(mid, photo: bool = False):
from bilireq.utils import get
url = f"{BASE_URL}/x/web-interface/card"
r = await get(url, params={"mid":mid, "photo": photo})
return r["card"]