koishi-plugin-vrchat 0.0.2 → 0.0.4

package/lib/index.d.ts

@@ -1,4 +1,9 @@
 import { Context, Schema } from 'koishi';
+declare module '@koishijs/cache' {
+    interface Tables {
+        vrchat_auth: string;
+    }
+}
 export declare const name = "vrchat";
 export declare const inject: string[];
 export interface Config {

package/lib/index.js

@@ -28,10 +28,19 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_koishi = require("koishi");
 var name = "vrchat";
-var inject = ["http"];
+var inject = ["http", "cache"];
 var Config = import_koishi.Schema.object({});
+function countryCodeToEmoji(code) {
+  if (!code || code.length !== 2) return "";
+  const A = 127462;
+  const offset = "A".charCodeAt(0);
+  const chars = code.toUpperCase().split("");
+  const first = A + (chars[0].charCodeAt(0) - offset);
+  const second = A + (chars[1].charCodeAt(0) - offset);
+  return String.fromCodePoint(first) + String.fromCodePoint(second);
+}
+__name(countryCodeToEmoji, "countryCodeToEmoji");
 function apply(ctx, config) {
-  let auth;
   ctx.command("vrchat-login", "登录 VRChat API").action(async ({ session }) => {
     if (!session.isDirect) return "请通过私聊进行登录";
     await session.send("请输入用户名或邮箱地址：");
@@ -56,24 +65,28 @@ function apply(ctx, config) {
       await session.send("请输入发送到邮箱的验证码：");
       const code = await session.prompt();
       if (!code) return "输入超时。";
-      const cookie = authResp.headers.get("set-cookie").split("; ")[0];
+      const cookie = authResp.headers.get("set-cookie").split("; ");
       const emailOtpResp = await ctx.http.post("https://api.vrchat.cloud/api/1/auth/twofactorauth/emailotp/verify", { code }, {
         headers: {
           "User-Agent": "VRCX 2026.02.11",
-          "Cookie": cookie
+          "Cookie": cookie[0]
         },
         responseType: "json",
         validateStatus: /* @__PURE__ */ __name((status) => status < 500, "validateStatus")
       });
       if (emailOtpResp.verified) {
-        auth = cookie;
+        const expires = new Date(cookie[3].split("=")[1]);
+        await ctx.cache.set("vrchat_auth", "cookie", cookie[0], expires.getTime() - Date.now());
         return "登录成功";
+      } else if (emailOtpResp.error) {
+        return emailOtpResp.error.message;
       }
     } else {
       ctx.logger.info(authResp);
     }
   });
   ctx.command("vrchat-avatars <keyword:text>", "检索 VRChat 模型").option("number", "-n <value:number>", { fallback: 10 }).action(async ({ session, options }, keyword) => {
+    const auth = await ctx.cache.get("vrchat_auth", "cookie");
     if (!auth) return "请先登录";
     if (!keyword) return "请输入关键词";
     const [msgId] = await session.send("检索中…");
@@ -94,6 +107,10 @@ function apply(ctx, config) {
       } catch {
       }
     }
+    if (avatarlist.length === 0) {
+      await session.bot.deleteMessage(session.channelId, msgId);
+      return "无检索结果";
+    }
     await session.send(`<message forward>${avatarlist.map(
       (e) => `<message>模型名：
 ${e.name}
@@ -119,6 +136,7 @@ ${new Date(e.updated_at).toLocaleString()}<img src="${e.imageUrl}"></img></messa
     await session.bot.deleteMessage(session.channelId, msgId);
   });
   ctx.command("vrchat-worlds <keyword:text>", "检索 VRChat 世界").option("number", "-n <value:number>", { fallback: 10 }).action(async ({ session, options }, keyword) => {
+    const auth = await ctx.cache.get("vrchat_auth", "cookie");
     if (!auth) return "请先登录";
     if (!keyword) return "请输入关键词";
     const [msgId] = await session.send("检索中…");
@@ -129,6 +147,10 @@ ${new Date(e.updated_at).toLocaleString()}<img src="${e.imageUrl}"></img></messa
       },
       responseType: "json"
     });
+    if (resp.length === 0) {
+      await session.bot.deleteMessage(session.channelId, msgId);
+      return "无检索结果";
+    }
     const messages = [];
     for (const item of resp) {
       let tags = [];
@@ -159,12 +181,13 @@ ${item.favorites}
 ${new Date(item.created_at).toLocaleString()}
 
 最后更新时间：
-${new Date(item.updated_at).toLocaleString()}<img src="${item.imageUrl}"></img></message>`);
+${new Date(item.updated_at).toLocaleString()}<img src="${item.thumbnailImageUrl}"></img></message>`);
     }
     await session.send(`<message forward>${messages.join("")}</message>`);
     await session.bot.deleteMessage(session.channelId, msgId);
   });
   ctx.command("vrchat-users <keyword:text>", "检索 VRChat 玩家").option("number", "-n <value:number>", { fallback: 3 }).action(async ({ session, options }, keyword) => {
+    const auth = await ctx.cache.get("vrchat_auth", "cookie");
     if (!auth) return "请先登录";
     if (!keyword) return "请输入关键词";
     const [msgId] = await session.send("检索中…");
@@ -175,6 +198,10 @@ ${new Date(item.updated_at).toLocaleString()}<img src="${item.imageUrl}"></img><
       },
       responseType: "json"
     });
+    if (resp.length === 0) {
+      await session.bot.deleteMessage(session.channelId, msgId);
+      return "无检索结果";
+    }
     const users = [];
     for (const item of resp) {
       const resp2 = await ctx.http.get(`https://api.vrchat.cloud/api/1/users/${item.id}`, {
@@ -189,26 +216,42 @@ ${new Date(item.updated_at).toLocaleString()}<img src="${item.imageUrl}"></img><
     const messages = [];
     for (const item of users) {
       let avatar = "";
+      let currentAvatarImageUrl = item.currentAvatarImageUrl;
       if (item.currentAvatarImageUrl.startsWith("https://api.vrchat.cloud")) {
-        const resp2 = await ctx.http.get(item.currentAvatarImageUrl.slice(0, -7), {
-          headers: {
-            "User-Agent": "VRCX 2026.02.11"
-          },
-          responseType: "json"
-        });
-        avatar = resp2.name.split(" - ")[1];
+        try {
+          const resp2 = await ctx.http.get(item.currentAvatarImageUrl.slice(0, -7), {
+            headers: {
+              "User-Agent": "VRCX 2026.02.11"
+            },
+            responseType: "json"
+          });
+          avatar = resp2.name.split(" - ")[1];
+        } catch {
+          currentAvatarImageUrl = void 0;
+        }
       }
       let location = item.location;
       if (item.location.startsWith("wrld_")) {
-        const resp2 = await ctx.http.get(`https://api.vrchat.cloud/api/1/worlds/${item.location.split(":")[0]}`, {
+        const info = item.location.split(":");
+        const resp2 = await ctx.http.get(`https://api.vrchat.cloud/api/1/worlds/${info[0]}`, {
           headers: {
             "User-Agent": "VRCX 2026.02.11",
             "Cookie": auth
           },
           responseType: "json"
         });
-        location = resp2.name;
+        const ext = info[1].split("~");
+        location = `${resp2.name} #${ext[0]} ${countryCodeToEmoji(ext.at(-1).match(/region\(([^)]+)\)/)[1])}`;
       }
+      const statusLight = {
+        "active": "🟢",
+        "join me": "🔵",
+        "ask me": "🟠",
+        "busy": "🔴",
+        "offline": "⚪"
+      }[item.status];
+      let imgUrl = item.userIcon || currentAvatarImageUrl;
+      const img = imgUrl ? `<img src="${imgUrl}"></img>` : "";
       messages.push(`<message>玩家名：
 ${item.displayName}
 
@@ -216,7 +259,7 @@ ${item.displayName}
 ${item.id}
 
 状态：
-${item.status} - ${item.statusDescription}
+${statusLight} ${item.status} - ${item.statusDescription}
 
 当前位置：
 ${location}
@@ -234,7 +277,7 @@ ${item.bio}
 ${item.bioLinks.join("\n")}
 
 账号创建日期：
-${item.date_joined}<img src="${item.userIcon || item.currentAvatarImageUrl}"></img></message>`);
+${item.date_joined}${img}</message>`);
     }
     await session.send(`<message forward>${messages.join("")}</message>`);
     await session.bot.deleteMessage(session.channelId, msgId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-vrchat",
-  "description": "Search VRChat Avatars and Worlds",
-  "version": "0.0.2",
+  "description": "Search VRChat avatars, worlds, and users",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -19,14 +19,17 @@
   "peerDependencies": {
     "koishi": "^4.17.7"
   },
+  "devDependencies": {
+    "@koishijs/cache": "^2.1.0"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/idranme/koishi-plugin-vrchat.git"
   },
   "koishi": {
     "description": {
-      "zh": "检索 VRChat 模型与世界",
-      "en": "Search VRChat Avatars and Worlds"
+      "zh": "检索 VRChat 模型、世界和玩家",
+      "en": "Search VRChat avatars, worlds, and users"
     },
     "browser": true
   }

package/readme.md

@@ -2,4 +2,4 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-vrchat?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-vrchat)
 
-Search VRChat Avatars and Worlds
+Search VRChat avatars, worlds, and users