koishi-plugin-echo-cave 1.3.3 → 1.4.1

package/lib/cqcode-helper.d.ts

@@ -0,0 +1,6 @@
+export declare function createTextMsg(content: string): {
+    type: string;
+    data: {
+        text: string;
+    };
+};

package/lib/index.cjs

@@ -105,16 +105,134 @@ async function processMessageContent(ctx, msg) {
   );
 }
 
+// src/cqcode-helper.ts
+function createTextMsg(content) {
+  return {
+    type: "text",
+    data: {
+      text: content
+    }
+  };
+}
+
+// src/onebot-helper.ts
+async function getUserName(ctx, session, userId) {
+  try {
+    const memberInfo = await session.onebot.getGroupMemberInfo(
+      session.channelId,
+      userId
+    );
+    return memberInfo.card || memberInfo.nickname || userId;
+  } catch (error) {
+    ctx.logger.warn(`\u83B7\u53D6\u7FA4\u6210\u5458\u4FE1\u606F\u5931\u8D25\uFF08userId: ${userId}\uFF09\uFF1A`, error);
+    return userId;
+  }
+}
+
 // src/msg-helper.ts
-async function sendCaveMsg(session, caveMsg) {
+async function sendCaveMsg(ctx, session, caveMsg) {
   const { channelId } = session;
   const content = JSON.parse(caveMsg.content);
+  const date = formatDate(caveMsg.createTime);
+  const originName = await getUserName(ctx, session, caveMsg.originUserId);
+  const userName = await getUserName(ctx, session, caveMsg.userId);
+  const forwardStyles = [
+    `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u4E00\u5219\u56DE\u58F0\u4ECE\u65F6\u5149\u4E2D\u98D8\u6765\u2014\u2014
+\u{1F4C5} ${date} \xB7 \u6765\u81EA @${originName}  
+\u{1F4EE} \u7531 @${userName} \u6295\u9012`,
+    `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u3010\u8BB0\u5F55\u7F16\u53F7\u3011${caveMsg.id}  
+\u3010\u521B\u5EFA\u65F6\u95F4\u3011${date}  
+\u3010\u539F\u59CB\u4F5C\u8005\u3011@${originName}  
+\u3010\u6295\u9012\u8005\u3011@${userName}`,
+    `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u8FD9\u58F0\u56DE\u54CD\u6700\u521D\u6765\u81EA @${originName}\uFF0C  
+\u7531 @${userName} \u5728 ${date} \u7559\u4E0B\u3002`,
+    `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u65F6\u95F4\u7684\u56DE\u97F3\u5728\u6B64\u6C47\u805A\u3002  
+\u{1F4C5} ${date}  
+\u{1F4E4} \u51FA\u5904\uFF1A@${originName}  
+\u{1F4EE} \u5C01\u5370\u8005\uFF1A@${userName}`,
+    `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u{1F4C5} ${date}  
+\u{1F464} \u6765\u81EA @${originName}  
+\u{1F4EE} \u6295\u9012\u8005 @${userName}`
+  ];
+  const msgStyles = [
+    {
+      prefix: `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u2014\u2014 \u6709\u4EBA\u7559\u4E0B\u4E86\u58F0\u97F3 \u2014\u2014
+
+`,
+      suffix: `\u{1F4C5} ${date} \xB7 \u6765\u81EA @${originName}
+\u{1F4EE} \u7531 @${userName} \u6295\u9012`
+    },
+    {
+      prefix: `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+`,
+      suffix: `\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+\u{1F4C5} ${date}
+\u{1F464} ${originName} \xB7 \u7531 @${userName} \u6295\u9012`
+    },
+    {
+      prefix: `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u{1F4AD}\u300C\u6709\u4EBA\u5728\u6D1E\u58C1\u7559\u4E0B\u5370\u8BB0\u300D
+
+`,
+      suffix: `\u{1F4C5} ${date}
+\u{1F4EE} ${userName} \u8BB0\u5F55`
+    },
+    {
+      prefix: `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+\u2014 \u56DE\u58F0\u5F00\u59CB \u2014
+
+`,
+      suffix: `\u2014 \u56DE\u58F0\u7ED3\u675F \u2014
+\u{1F4C5} ${date} \xB7 @${originName}
+\u{1F4EE} @${userName}`
+    },
+    {
+      prefix: `\u{1F300} \u56DE\u58F0\u6D1E #${caveMsg.id}
+
+`,
+      suffix: `\u{1F4C5} ${date}
+\u6765\u81EA @${originName}
+\u7531 @${userName} \u6295\u9012`
+    }
+  ];
+  const random = (arr) => arr[Math.floor(Math.random() * arr.length)];
   if (caveMsg.type === "forward") {
+    const chosen = random(forwardStyles);
+    await session.onebot.sendGroupMsg(channelId, [createTextMsg(chosen)]);
     await session.onebot.sendGroupForwardMsg(channelId, content);
   } else {
+    const chosen = random(msgStyles);
+    const last = content.at(-1);
+    const needsNewline = last?.type === "text";
+    content.unshift(createTextMsg(chosen.prefix));
+    content.push(
+      createTextMsg(`${needsNewline ? "\n" : ""}${chosen.suffix}`)
+    );
     await session.onebot.sendGroupMsg(channelId, content);
   }
 }
+function formatDate(date) {
+  return date.toLocaleDateString("zh-CN", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit"
+  });
+}
 
 // src/index.ts
 var name = "echo-cave";
@@ -158,8 +276,8 @@ async function getCave(ctx, session, id) {
     return "\u274C \u8BF7\u5728\u7FA4\u804A\u4E2D\u4F7F\u7528\u8BE5\u547D\u4EE4\uFF01";
   }
   let caveMsg;
+  const { channelId } = session;
   if (!id) {
-    const { channelId } = session;
     const caves = await ctx.database.get("echo_cave", {
       channelId
     });
@@ -168,13 +286,16 @@ async function getCave(ctx, session, id) {
     }
     caveMsg = caves[Math.floor(Math.random() * caves.length)];
   } else {
-    const caves = await ctx.database.get("echo_cave", id);
+    const caves = await ctx.database.get("echo_cave", {
+      id,
+      channelId
+    });
     if (caves.length === 0) {
       return "\u{1F50D} \u672A\u627E\u5230\u8BE5 ID \u7684\u56DE\u58F0\u6D1E\u6D88\u606F";
     }
     caveMsg = caves[0];
   }
-  await sendCaveMsg(session, caveMsg);
+  await sendCaveMsg(ctx, session, caveMsg);
 }
 async function deleteCave(ctx, session, id) {
   if (!session.guildId) {
@@ -234,10 +355,6 @@ async function addCave(ctx, session) {
       session.channelId,
       `\u2705 \u56DE\u58F0\u6D1E\u6D88\u606F\u5DF2\u6210\u529F\u5B58\u5165\uFF0C\u6D88\u606F ID\uFF1A${result.id}`
     );
-    ctx.setTimeout(
-      async () => await session.onebot.deleteMsg(messageId2),
-      5e3
-    );
   } catch (error) {
     this.ctx.logger.warn("\u4E0A\u67B6\u5546\u54C1\u5931\u8D25:", error);
     return "\u274C \u4E0A\u67B6\u5546\u54C1\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01";

package/lib/msg-helper.d.ts

@@ -1,3 +1,4 @@
-import { Session } from 'koishi';
+import { Context, Session } from 'koishi';
 import { EchoCave } from './index';
-export declare function sendCaveMsg(session: Session, caveMsg: EchoCave): Promise<void>;
+export declare function sendCaveMsg(ctx: Context, session: Session, caveMsg: EchoCave): Promise<void>;
+export declare function formatDate(date: Date): string;

package/lib/onebot-helper.d.ts

@@ -0,0 +1,2 @@
+import { Context, Session } from 'koishi';
+export declare function getUserName(ctx: Context, session: Session, userId: string): Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.3.3",
+  "version": "1.4.1",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",