koishi-plugin-prism-neo 0.0.6 → 0.0.9

package/lib/index.js

@@ -172,6 +172,14 @@ var Config = import_koishi.Schema.object({
   url: import_koishi.Schema.string().required(),
   admin: import_koishi.Schema.string().default("authority:3")
 });
+async function getUserName(session, userId) {
+  if (userId) {
+    return (await session.bot.getUser(userId)).name + `( ${userId} )`;
+  } else {
+    return "匿名用户";
+  }
+}
+__name(getUserName, "getUserName");
 var handleAction = /* @__PURE__ */ __name((action) => {
   return async (argv, ...args) => {
     let message;
@@ -285,7 +293,7 @@ async function handleLoginCmd(context, user) {
   await login(context, userId);
   const pwd = await getLock(context, userId);
   if (user) {
-    return `✅ 已为用户 ${userId} 入场，该用户的门锁密码是: ${pwd.password}
+    return `✅ 已为用户 ${getUserName(context.session, userId)} 入场，该用户的门锁密码是: ${pwd.password}
 注意! 门锁密码有效期为三分钟`;
   }
   return `✅ 入场成功，你的门锁密码是: ${pwd.password}
@@ -300,7 +308,7 @@ async function handleLogoutCmd(context, user) {
   if (pendingLogout && now - pendingLogout < 60 * 1e3) {
     kv.delete(targetUserId);
     const res = await logout(context, targetUserId);
-    const messagePrefix = user ? `✅ 已为用户 ${targetUserId} 退场` : "✅ 退场成功";
+    const messagePrefix = user ? `✅ 已为用户 ${getUserName(context.session, targetUserId)} 退场` : "✅ 退场成功";
     return [
       messagePrefix,
       `入场时间: ${formatDateTime(res.session.createdAt)}`,
@@ -312,7 +320,7 @@ async function handleLogoutCmd(context, user) {
     const billingMessage = formatBilling(billingRes);
     kv.set(targetUserId, now);
     if (user) {
-      return `以下是用户 ${targetUserId} 的账单预览:
+      return `以下是用户 ${await getUserName(context.session, targetUserId)} 的账单预览:
 
 ${billingMessage}
 
@@ -331,25 +339,17 @@ async function handleListCmd(context, user) {
   if (!users || users.length === 0) {
     return "窝里目前没有玩家呢";
   }
-  const userIds = users.map((user2) => {
+  const tasks = users.map((user2) => {
+    const entryDate = formatDateTime(user2.sessions[0].createdAt);
     const qqBind = user2.binds.find((bind) => bind.type === "QQ");
-    if (qqBind) {
-      const id = qqBind.bid;
-      const entryDate = formatDateTime(user2.sessions[0].createdAt);
-      return { id, entryDate };
-    }
+    let id = qqBind ? qqBind.bid : null;
+    return { entryDate, task: getUserName(context.session, id) };
+  });
+  const platformUsers = await Promise.all(tasks.map((t) => t.task));
+  const userReports = platformUsers.map((u, idx) => {
+    return `玩家: ${u}
+入场时间: ${tasks[idx].entryDate}`;
   });
-  const platformUsers = await Promise.all(
-    userIds.map((id) => {
-      return context.session.bot.getUser(id.id);
-    })
-  );
-  const userReports = platformUsers.map(
-    (u, idx) => {
-      return `玩家: ${u.name}
-入场时间: ${userIds[idx].entryDate}`;
-    }
-  );
   return `窝里目前共有 ${users.length} 人
 
 ${userReports.join("\n\n")}`;
@@ -361,7 +361,7 @@ async function handleWalletCmd(context, user) {
   const res = await wallet(context, userId);
   const message = [];
   const targetUserId = user ? userId : void 0;
-  message.push(targetUserId ? `--- 用户 ${targetUserId} 的钱包余额 ---` : "--- 钱包余额 ---");
+  message.push(targetUserId ? `--- 用户 ${await getUserName(context.session, targetUserId)} 的钱包余额 ---` : "--- 钱包余额 ---");
   message.push(
     `可用: ${res.total.available} 月饼 (共 ${res.total.all})`,
     `  - 付费: ${res.paid.available}`,
@@ -406,7 +406,7 @@ async function handleBillingCmd(context, user) {
   const res = await billing(context, userId);
   const billingMessage = formatBilling(res);
   if (user) {
-    return `用户 ${userId} 的账单:
+    return `用户 ${await getUserName(context.session, userId)} 的账单:
 
 ${billingMessage}`;
   }
@@ -427,9 +427,9 @@ async function handleItemsCmd(context, user) {
   if (error) return error;
   const userAssets = await assets(context, userId);
   if (!userAssets || userAssets.length === 0) {
-    return user ? `用户 ${userId} 没有任何物品。` : "您当前没有任何物品。";
+    return user ? `用户 ${await getUserName(context.session, userId)} 没有任何物品。` : "您当前没有任何物品。";
   }
-  const header = user ? `--- 用户 ${userId} 拥有的物品 ---` : "--- 您拥有的物品 ---";
+  const header = user ? `--- 用户 ${await getUserName(context.session, userId)} 拥有的物品 ---` : "--- 您拥有的物品 ---";
   const itemsList = userAssets.map((asset) => {
     let line = `- ${asset.asset.name} (x${asset.count})`;
     if (asset.expireAt) {
@@ -476,7 +476,7 @@ async function handleWalletAdd(context, user, amount) {
   if (!amount) return "请输入数量";
   const res = await walletAdd(context, parseInt(amount), userId);
   return [
-    `为用户 ${userId} 增加月饼成功`,
+    `为用户 ${await getUserName(context.session, userId)} 增加月饼成功`,
     `增加前: ${res.originalBalance}`,
     `增加后: ${res.finalBalance}`
   ].join("\n");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-prism-neo",
   "description": "prism koishi前端",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "main": "lib/index.js",
   "files": [
     "lib",