koishi-plugin-chatluna 1.3.30 → 1.3.32

package/lib/chains/chain.d.ts

@@ -46,7 +46,7 @@ export declare class ChainMiddleware {
     constructor(name: string, execute: ChainMiddlewareFunction, graph: ChatChainDependencyGraph);
     before<T extends keyof ChainMiddlewareName>(name: T): this;
     after<T extends keyof ChainMiddlewareName>(name: T): this;
-    run(session: Session, options: ChainMiddlewareContext): Promise<string | h[] | h[][] | ChainMiddlewareRunStatus>;
+    run(session: Session, options: ChainMiddlewareContext): Promise<string | ChainMiddlewareRunStatus | h[] | h[][]>;
 }
 export interface ChainMiddlewareContext {
     config: Config;

package/lib/chains/index.cjs

@@ -582,7 +582,7 @@ var DefaultChatChainSender = class {
   }
   async send(session, messages) {
     if (!messages?.length) return;
-    if (isElementArray(messages?.[0]) && messages[0][1].type === "markdown-qq") {
+    if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
       return;
     }
@@ -594,7 +594,7 @@ var DefaultChatChainSender = class {
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    session.bot.internal.sendPrivateMessage(user.id, {
+    await session.bot.internal.sendPrivateMessage(user.id, {
       msg_type: 2,
       msg_seq: 1,
       msg_id: session.messageId,

package/lib/chains/index.mjs

@@ -537,7 +537,7 @@ var DefaultChatChainSender = class {
   }
   async send(session, messages) {
     if (!messages?.length) return;
-    if (isElementArray(messages?.[0]) && messages[0][1].type === "markdown-qq") {
+    if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
       return;
     }
@@ -549,7 +549,7 @@ var DefaultChatChainSender = class {
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    session.bot.internal.sendPrivateMessage(user.id, {
+    await session.bot.internal.sendPrivateMessage(user.id, {
       msg_type: 2,
       msg_seq: 1,
       msg_id: session.messageId,

package/lib/index.cjs

@@ -3551,6 +3551,9 @@ function apply26(ctx, config, chain) {
     context.options.inputMessage = transformedMessage;
     return 2 /* CONTINUE */;
   }).after("resolve_room");
+  ctx.chatluna.messageTransformer.before(async (session, elements) => {
+    appendQQAttachments(session, elements);
+  });
   ctx.chatluna.messageTransformer.intercept(
     "text",
     async (session, element, message) => {
@@ -4054,6 +4057,60 @@ function trackForwardId(element, message) {
   }
 }
 __name(trackForwardId, "trackForwardId");
+function appendQQAttachments(session, elements) {
+  if (session.platform !== "qq") {
+    return;
+  }
+  const qq = session.qq;
+  const attachments = qq?.["d"]?.attachments;
+  if (!attachments?.length) {
+    return;
+  }
+  for (const attachment of attachments) {
+    const type = attachment.content_type;
+    const src = attachment.url;
+    const exists = elements.some(
+      (element) => element.attrs.src === src || element.attrs.url === src
+    );
+    if (exists) {
+      continue;
+    }
+    if (type === "file") {
+      elements.push(
+        import_koishi7.h.file(src, {
+          filename: attachment.filename
+        })
+      );
+    } else if (type.startsWith("audio/")) {
+      elements.push(
+        import_koishi7.h.audio(src, {
+          filename: attachment.filename,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    } else if (type === "voice") {
+      elements.push(
+        import_koishi7.h.audio(src, {
+          filename: attachment.filename,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    } else if (type.startsWith("video/")) {
+      elements.push(
+        import_koishi7.h.video(src, {
+          filename: attachment.filename,
+          width: attachment.width,
+          height: attachment.height,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    }
+  }
+}
+__name(appendQQAttachments, "appendQQAttachments");
 
 // src/middlewares/chat/render_message.ts
 function apply27(ctx, config, chain) {

package/lib/index.mjs

@@ -3557,6 +3557,9 @@ function apply26(ctx, config, chain) {
     context.options.inputMessage = transformedMessage;
     return 2 /* CONTINUE */;
   }).after("resolve_room");
+  ctx.chatluna.messageTransformer.before(async (session, elements) => {
+    appendQQAttachments(session, elements);
+  });
   ctx.chatluna.messageTransformer.intercept(
     "text",
     async (session, element, message) => {
@@ -4060,6 +4063,60 @@ function trackForwardId(element, message) {
   }
 }
 __name(trackForwardId, "trackForwardId");
+function appendQQAttachments(session, elements) {
+  if (session.platform !== "qq") {
+    return;
+  }
+  const qq = session.qq;
+  const attachments = qq?.["d"]?.attachments;
+  if (!attachments?.length) {
+    return;
+  }
+  for (const attachment of attachments) {
+    const type = attachment.content_type;
+    const src = attachment.url;
+    const exists = elements.some(
+      (element) => element.attrs.src === src || element.attrs.url === src
+    );
+    if (exists) {
+      continue;
+    }
+    if (type === "file") {
+      elements.push(
+        h4.file(src, {
+          filename: attachment.filename
+        })
+      );
+    } else if (type.startsWith("audio/")) {
+      elements.push(
+        h4.audio(src, {
+          filename: attachment.filename,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    } else if (type === "voice") {
+      elements.push(
+        h4.audio(src, {
+          filename: attachment.filename,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    } else if (type.startsWith("video/")) {
+      elements.push(
+        h4.video(src, {
+          filename: attachment.filename,
+          width: attachment.width,
+          height: attachment.height,
+          type,
+          chatluna_file_url: src
+        })
+      );
+    }
+  }
+}
+__name(appendQQAttachments, "appendQQAttachments");
 
 // src/middlewares/chat/render_message.ts
 function apply27(ctx, config, chain) {

package/lib/services/chat.cjs

@@ -718,7 +718,7 @@ var DefaultChatChainSender = class {
   }
   async send(session, messages) {
     if (!messages?.length) return;
-    if (isElementArray(messages?.[0]) && messages[0][1].type === "markdown-qq") {
+    if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
       return;
     }
@@ -730,7 +730,7 @@ var DefaultChatChainSender = class {
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    session.bot.internal.sendPrivateMessage(user.id, {
+    await session.bot.internal.sendPrivateMessage(user.id, {
       msg_type: 2,
       msg_seq: 1,
       msg_id: session.messageId,
@@ -836,6 +836,7 @@ var MessageTransformer = class {
   static {
     __name(this, "MessageTransformer");
   }
+  _beforeTransformFunctions = [];
   _transformFunctions = /* @__PURE__ */ new Map();
   async transform(session, elements, model, message = {
     content: "",
@@ -845,6 +846,13 @@ var MessageTransformer = class {
     quote: false,
     includeQuoteReply: true
   }) {
+    await this._runBeforeTransform(
+      session,
+      elements,
+      message,
+      model,
+      options
+    );
     const sourceElementString = elements.map((h2) => h2.toString(true)).join();
     const quoteElementString = ((session.quote && session.quote.elements) ?? []).map((h2) => h2.toString(true)).join();
     for (const element of elements) {
@@ -912,6 +920,27 @@ User's message: ${currentText}`;
     }
     return message;
   }
+  before(transformFunction, priority = 0) {
+    const wrapper = {
+      func: transformFunction,
+      priority
+    };
+    const insertIndex = this._beforeTransformFunctions.findIndex(
+      (item) => item.priority > priority
+    );
+    if (insertIndex === -1) {
+      this._beforeTransformFunctions.push(wrapper);
+    } else {
+      this._beforeTransformFunctions.splice(insertIndex, 0, wrapper);
+    }
+    return () => {
+      const index = this._beforeTransformFunctions.findIndex(
+        (item) => item.func === transformFunction
+      );
+      if (index === -1) return;
+      this._beforeTransformFunctions.splice(index, 1);
+    };
+  }
   intercept(type, transformFunction, priority = 0) {
     const functions = this._transformFunctions.get(type);
     if (type === "text" && functions?.length) {
@@ -1021,6 +1050,11 @@ User's message: ${currentText}`;
       });
     }
   }
+  async _runBeforeTransform(session, elements, message, model, options) {
+    for (const { func: transformFunction } of this._beforeTransformFunctions) {
+      await transformFunction(session, elements, message, model, options);
+    }
+  }
 };
 
 // src/services/chat.ts

package/lib/services/chat.mjs

@@ -714,7 +714,7 @@ var DefaultChatChainSender = class {
   }
   async send(session, messages) {
     if (!messages?.length) return;
-    if (isElementArray(messages?.[0]) && messages[0][1].type === "markdown-qq") {
+    if (isElementArray(messages?.[0]) && messages[0][1]?.type === "markdown-qq") {
       await this.sendAsQQMarkdown(session, messages[0][0]);
       return;
     }
@@ -726,7 +726,7 @@ var DefaultChatChainSender = class {
   }
   async sendAsQQMarkdown(session, message) {
     const { user } = session.event;
-    session.bot.internal.sendPrivateMessage(user.id, {
+    await session.bot.internal.sendPrivateMessage(user.id, {
       msg_type: 2,
       msg_seq: 1,
       msg_id: session.messageId,
@@ -848,6 +848,7 @@ var MessageTransformer = class {
   static {
     __name(this, "MessageTransformer");
   }
+  _beforeTransformFunctions = [];
   _transformFunctions = /* @__PURE__ */ new Map();
   async transform(session, elements, model, message = {
     content: "",
@@ -857,6 +858,13 @@ var MessageTransformer = class {
     quote: false,
     includeQuoteReply: true
   }) {
+    await this._runBeforeTransform(
+      session,
+      elements,
+      message,
+      model,
+      options
+    );
     const sourceElementString = elements.map((h2) => h2.toString(true)).join();
     const quoteElementString = ((session.quote && session.quote.elements) ?? []).map((h2) => h2.toString(true)).join();
     for (const element of elements) {
@@ -924,6 +932,27 @@ User's message: ${currentText}`;
     }
     return message;
   }
+  before(transformFunction, priority = 0) {
+    const wrapper = {
+      func: transformFunction,
+      priority
+    };
+    const insertIndex = this._beforeTransformFunctions.findIndex(
+      (item) => item.priority > priority
+    );
+    if (insertIndex === -1) {
+      this._beforeTransformFunctions.push(wrapper);
+    } else {
+      this._beforeTransformFunctions.splice(insertIndex, 0, wrapper);
+    }
+    return () => {
+      const index = this._beforeTransformFunctions.findIndex(
+        (item) => item.func === transformFunction
+      );
+      if (index === -1) return;
+      this._beforeTransformFunctions.splice(index, 1);
+    };
+  }
   intercept(type, transformFunction, priority = 0) {
     const functions = this._transformFunctions.get(type);
     if (type === "text" && functions?.length) {
@@ -1033,6 +1062,11 @@ User's message: ${currentText}`;
       });
     }
   }
+  async _runBeforeTransform(session, elements, message, model, options) {
+    for (const { func: transformFunction } of this._beforeTransformFunctions) {
+      await transformFunction(session, elements, message, model, options);
+    }
+  }
 };
 
 // src/services/chat.ts

package/lib/services/message_transform.d.ts

@@ -1,17 +1,22 @@
 import { h, Session } from 'koishi';
 import { Config } from 'koishi-plugin-chatluna';
 import { Message } from '../types';
+export interface MessageTransformOptions {
+    quote: boolean;
+    includeQuoteReply: boolean;
+}
 export declare class MessageTransformer {
     private _config;
+    private _beforeTransformFunctions;
     private _transformFunctions;
     constructor(_config: Config);
-    transform(session: Session, elements: h[], model: string, message?: Message, options?: {
-        quote: boolean;
-        includeQuoteReply: boolean;
-    }): Promise<Message>;
+    transform(session: Session, elements: h[], model: string, message?: Message, options?: MessageTransformOptions): Promise<Message>;
+    before(transformFunction: BeforeMessageTransformFunction, priority?: number): () => void;
     intercept(type: string, transformFunction: MessageTransformFunction, priority?: number): () => void;
     replace(type: string, transformFunction: MessageTransformFunction): () => void;
     has(type: string): boolean;
     private _processElement;
+    private _runBeforeTransform;
 }
+export type BeforeMessageTransformFunction = (session: Session, elements: h[], message: Message, model?: string, options?: MessageTransformOptions) => Promise<void>;
 export type MessageTransformFunction = (session: Session, element: h, message: Message, model?: string) => Promise<boolean | void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chatluna",
   "description": "chatluna for koishi",
-  "version": "1.3.30",
+  "version": "1.3.32",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
   "typings": "lib/index.d.ts",
@@ -259,14 +259,14 @@
     "@initencounter/vits": "^0.0.3",
     "@koishijs/cache": "^2.1.0",
     "@koishijs/censor": "^1.1.0",
+    "@koishijs/plugin-adapter-qq": "^4.10.1",
     "@koishijs/plugin-notifier": "^1.2.1",
     "@types/he": "^1.2.3",
     "@types/js-yaml": "^4.0.9",
     "@types/qrcode": "^1.5.5",
     "@types/useragent": "^2",
     "atsc": "^2.1.0",
-    "koishi-plugin-adapter-onebot": "^6.8.0",
-    "@koishijs/plugin-adapter-qq": "^4.10.1"
+    "koishi-plugin-adapter-onebot": "^6.8.0"
   },
   "peerDependencies": {
     "koishi": "^4.18.9",