yz-yuki-plugin 2.0.5-10 → 2.0.5-12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/apps/bilibili.js
CHANGED
|
@@ -445,7 +445,7 @@ message.use(async (e) => {
|
|
|
445
445
|
}
|
|
446
446
|
const message = [`昵称：${data?.name}`, `\n性别：${data?.sex}`, `\n等级：${data?.level}`];
|
|
447
447
|
if (data.live_room) {
|
|
448
|
-
message.push(
|
|
448
|
+
message.push(`\n***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? '直播中' : '未开播'}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
|
|
449
449
|
e.reply(`直播链接：${data?.live_room?.url}`);
|
|
450
450
|
}
|
|
451
451
|
e.reply(message);
|
|
@@ -50,15 +50,16 @@ class BiliGetWebData {
|
|
|
50
50
|
let { cookie } = await readSyncCookie();
|
|
51
51
|
cookie = await cookieWithBiliTicket(cookie);
|
|
52
52
|
const dmImg = await getDmImg();
|
|
53
|
+
const w_webid = await getWebId(uid);
|
|
53
54
|
const data = {
|
|
54
55
|
mid: uid,
|
|
55
56
|
token: '',
|
|
56
57
|
platform: 'web',
|
|
57
58
|
web_location: 1550101,
|
|
58
|
-
...dmImg
|
|
59
|
+
...dmImg,
|
|
60
|
+
w_webid: w_webid
|
|
59
61
|
};
|
|
60
62
|
let signCookie = (await readSavedCookieItems(cookie, ['SESSDATA'], false)) || (await readSavedCookieOtherItems(cookie, ['SESSDATA']));
|
|
61
|
-
const w_webid = await getWebId(uid);
|
|
62
63
|
const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
|
|
63
64
|
const params = {
|
|
64
65
|
...data,
|
|
@@ -7,10 +7,10 @@ async function getDmImg() {
|
|
|
7
7
|
const dm_cover_img_str = 'QU5HTEUgKEludGVsLCBJbnRlbChSKSBIRCBHcmFwaGljcyBEaXJlY3QzRDExIHZzXzVfMCBwc181XzApLCBvciBzaW1pbGFyR29vZ2xlIEluYy4gKEludGVsKQ';
|
|
8
8
|
const dm_img_inter = { ds: [], wh: [0, 0, 0], of: [0, 0, 0] };
|
|
9
9
|
return {
|
|
10
|
-
dm_img_list: dm_img_list,
|
|
10
|
+
dm_img_list: String(dm_img_list).replace(/\s+/g, ''),
|
|
11
11
|
dm_img_str: dm_img_str,
|
|
12
12
|
dm_cover_img_str: dm_cover_img_str,
|
|
13
|
-
dm_img_inter: dm_img_inter
|
|
13
|
+
dm_img_inter: String(dm_img_inter).replace(/\s+/g, '')
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -8,7 +8,7 @@ async function getWebId(uid) {
|
|
|
8
8
|
const w_webid_key = 'Yz:yuki:bili:w_webid';
|
|
9
9
|
const w_webid = await Redis.get(w_webid_key);
|
|
10
10
|
if (w_webid) {
|
|
11
|
-
return w_webid;
|
|
11
|
+
return String(w_webid);
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
14
|
const url = `https://space.bilibili.com/${uid ? uid : 401742377}/dynamic`;
|
|
@@ -30,7 +30,7 @@ async function getWebId(uid) {
|
|
|
30
30
|
const access_id = decoded__RENDER_DATA__JsonString.match(accessIdRegex);
|
|
31
31
|
if (access_id && access_id[1]) {
|
|
32
32
|
await Redis.set(w_webid_key, access_id[1], { EX: 43197 * 1000 });
|
|
33
|
-
return access_id[1];
|
|
33
|
+
return String(access_id[1]);
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
console.error('Failed to get access_id from __RENDER_DATA__');
|