koishi-plugin-echo-cave 1.12.0 → 1.12.1

package/lib/forward-helper.d.ts

@@ -1,5 +1,5 @@
 import { Config } from './index';
 import { CQCode } from '@pynickle/koishi-plugin-adapter-onebot';
 import { Message } from '@pynickle/koishi-plugin-adapter-onebot/lib/types';
-import { Context } from 'koishi';
-export declare function reconstructForwardMsg(ctx: Context, message: Message[], cfg: Config): Promise<CQCode[]>;
+import { Context, Session } from 'koishi';
+export declare function reconstructForwardMsg(ctx: Context, session: Session, message: Message[], cfg: Config): Promise<CQCode[]>;

package/lib/index.cjs

@@ -356,28 +356,39 @@ async function checkAndCleanMediaFiles(ctx, cfg, type) {
 }
 
 // src/forward-helper.ts
-async function reconstructForwardMsg(ctx, message, cfg) {
+async function reconstructForwardMsg(ctx, session, message, cfg) {
   return Promise.all(
     message.map(async (msg) => {
-      const content = await processForwardMessageContent(ctx, msg, cfg);
+      const content = await processForwardMessageContent(ctx, session, msg, cfg);
+      const senderNickname = msg.sender.nickname;
+      let senderUserId = msg.sender.user_id;
+      senderUserId = senderUserId === 1094950020 ? await getUserIdFromNickname(session, senderNickname, senderUserId) : senderUserId;
       return {
         type: "node",
         data: {
-          user_id: msg.sender.user_id,
-          nickname: msg.sender.nickname,
+          user_id: senderUserId,
+          nickname: senderNickname,
           content
         }
       };
     })
   );
 }
-async function processForwardMessageContent(ctx, msg, cfg) {
+async function getUserIdFromNickname(session, nickname, userId) {
+  const memberInfos = await session.onebot.getGroupMemberList(session.channelId);
+  const matches = memberInfos.filter((m) => m.nickname === nickname);
+  if (matches.length === 1) {
+    return matches[0].user_id;
+  }
+  return userId;
+}
+async function processForwardMessageContent(ctx, session, msg, cfg) {
   if (typeof msg.message === "string") {
     return msg.message;
   }
   const firstElement = msg.message[0];
   if (firstElement?.type === "forward") {
-    return reconstructForwardMsg(ctx, firstElement.data.content, cfg);
+    return reconstructForwardMsg(ctx, session, firstElement.data.content, cfg);
   }
   return Promise.all(
     msg.message.map(async (element) => {
@@ -566,6 +577,7 @@ async function addCave(ctx, session, cfg) {
     type = "forward";
     const message = await reconstructForwardMsg(
       ctx,
+      session,
       await session.onebot.getForwardMsg(messageId),
       cfg
     );

package/package.json

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