koishi-plugin-cat-raising 1.3.4 → 1.3.6

package/lib/index.js

@@ -237,28 +237,47 @@ async function fetchBilibiliInfo(ctx, roomId) {
     let uid;
     let anchorName = "未知";
     try {
-      const infoByRoom = await ctx.http.get(
-        `https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=${roomId}`,
+      const anchorInRoom = await ctx.http.get(
+        `https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${roomId}`,
         { headers: commonHeaders }
       );
-      uid = infoByRoom?.data?.room_info?.uid || uid;
-      anchorName = infoByRoom?.data?.anchor_info?.base_info?.uname || infoByRoom?.data?.anchor_info?.uname || anchorName;
+      uid = anchorInRoom?.data?.info?.uid || uid;
+      anchorName = anchorInRoom?.data?.info?.uname || anchorName;
     } catch {
     }
     if (!uid || anchorName === "未知") {
       try {
-        const initInfo = await ctx.http.get(
-          `https://api.live.bilibili.com/room/v1/Room/room_init?id=${roomId}`,
+        const roomInfo = await ctx.http.get(
+          `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`,
           { headers: commonHeaders }
         );
-        uid = initInfo?.data?.uid || uid;
-        const roomInfo2 = await ctx.http.get(
-          `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${initInfo?.data?.room_id || roomId}`,
+        uid = roomInfo?.data?.uid || uid;
+        anchorName = roomInfo?.data?.uname || anchorName;
+      } catch {
+      }
+    }
+    if (anchorName === "未知" || !uid) {
+      await sleep(300);
+      try {
+        const anchorInRoom2 = await ctx.http.get(
+          `https://api.live.bilibili.com/live_user/v1/UserInfo/get_anchor_in_room?roomid=${roomId}`,
           { headers: commonHeaders }
         );
-        anchorName = roomInfo2?.data?.uname || anchorName;
+        uid = uid || anchorInRoom2?.data?.info?.uid;
+        anchorName = anchorInRoom2?.data?.info?.uname || anchorName;
       } catch {
       }
+      if (!uid || anchorName === "未知") {
+        try {
+          const roomInfo2 = await ctx.http.get(
+            `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${roomId}`,
+            { headers: commonHeaders }
+          );
+          uid = uid || roomInfo2?.data?.uid;
+          anchorName = roomInfo2?.data?.uname || anchorName;
+        } catch {
+        }
+      }
     }
     if (!uid) throw new Error("无法从房间信息中获取UID");
     const statsInfo = await ctx.http.get(
@@ -273,85 +292,6 @@ async function fetchBilibiliInfo(ctx, roomId) {
     );
     const videoCount = statsInfo?.data?.video;
     if (videoCount === void 0) throw new Error("无法从空间信息中获取投稿数");
-    try {
-      const anchorInfo = await ctx.http.get(
-        `https://api.bilibili.com/x/space/acc/info?mid=${uid}`,
-        {
-          headers: {
-            ...commonHeaders,
-            Origin: "https://space.bilibili.com",
-            Referer: `https://space.bilibili.com/${uid}`
-          }
-        }
-      );
-      anchorName = anchorInfo?.data?.name || anchorName;
-    } catch {
-    }
-    if (anchorName === "未知") {
-      try {
-        const liveUser = await ctx.http.get(
-          `https://api.live.bilibili.com/live_user/v3/UserInfo/get_info?uid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://live.bilibili.com",
-              Referer: `https://live.bilibili.com/${roomId}`
-            }
-          }
-        );
-        anchorName = liveUser?.data?.info?.uname || anchorName;
-      } catch {
-      }
-    }
-    if (anchorName === "未知") {
-      try {
-        const baseInfo = await ctx.http.get(
-          `https://api.live.bilibili.com/xlive/web-room/v1/index/getRoomBaseInfo?room_id=${roomId}`,
-          { headers: commonHeaders }
-        );
-        anchorName = baseInfo?.data?.anchor_info?.base_info?.uname || baseInfo?.data?.anchor_info?.uname || baseInfo?.data?.room_info?.uname || baseInfo?.data?.uname || anchorName;
-      } catch {
-      }
-    }
-    if (anchorName === "未知") {
-      await sleep(300);
-      try {
-        const infoByRoom2 = await ctx.http.get(
-          `https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom?room_id=${roomId}`,
-          { headers: commonHeaders }
-        );
-        anchorName = infoByRoom2?.data?.anchor_info?.base_info?.uname || infoByRoom2?.data?.anchor_info?.uname || anchorName;
-      } catch {
-      }
-      try {
-        const anchorInfo2 = await ctx.http.get(
-          `https://api.bilibili.com/x/space/acc/info?mid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://space.bilibili.com",
-              Referer: `https://space.bilibili.com/${uid}`
-            }
-          }
-        );
-        anchorName = anchorInfo2?.data?.name || anchorName;
-      } catch {
-      }
-      try {
-        const liveUser2 = await ctx.http.get(
-          `https://api.live.bilibili.com/live_user/v3/UserInfo/get_info?uid=${uid}`,
-          {
-            headers: {
-              ...commonHeaders,
-              Origin: "https://live.bilibili.com",
-              Referer: `https://live.bilibili.com/${roomId}`
-            }
-          }
-        );
-        anchorName = liveUser2?.data?.info?.uname || anchorName;
-      } catch {
-      }
-    }
     return { videoCount, anchorName };
   } catch (error) {
     const status = error?.response?.status;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cat-raising",
   "description": "",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [