合并 onTriggerChannelAction

Author: linyuan.yang

packages/sbot/src/Channel/ChannelManager.ts

@@ -146,7 +146,7 @@ export class ChannelManager {
                 onReceiveMessage: (session, query, args) =>
                     sessionManager.onReceiveChannelMessage(channelThreadId(plugin.type, channelId, session.sessionId), query, { ...args, channelType: plugin.type, channelId, dbSessionId: session.dbSessionId }),
                 onTriggerAction: (session, args) =>
-                    sessionManager.onChannelTriggerAction(channelThreadId(plugin.type, channelId, session.sessionId), { ...args, channelType: plugin.type, channelId }),
+                    sessionManager.onTriggerChannelAction(channelThreadId(plugin.type, channelId, session.sessionId), { ...args, channelType: plugin.type, channelId }),
             };
             const service = await plugin.init(ctx);
             if (service) {

packages/sbot/src/Server/HttpServer.ts

@@ -524,7 +524,7 @@ class HttpServer {
                         case WsCommandType.Approval:
                         case WsCommandType.Ask:
                         case WsCommandType.Abort: {
-                            sessionManager.onWebTriggerAction(threadId, msg.type!, msg).catch(e => logger.error(`ws trigger error: ${e?.message ?? e}`));
+                            sessionManager.onTriggerChannelAction(threadId, msg.type!, msg).catch(e => logger.error(`ws trigger error: ${e?.message ?? e}`));
                             break;
                         }
                     }

packages/sbot/src/Session/SessionManager.ts

@@ -254,14 +254,9 @@ export class SbotSessionManager extends SessionManager {
 
     // ── Trigger action routing ──
 
-    async onChannelTriggerAction(threadId: string, args: any): Promise<void> {
+    async onTriggerChannelAction(threadId: string, ...args: any[]): Promise<void> {
         const session = this.getSession(threadId) as SbotSession | undefined;
-        await session?.triggerAction(args);
-    }
-
-    async onWebTriggerAction(threadId: string, type: string, msg: Record<string, any>): Promise<void> {
-        const session = this.getSession(threadId) as SbotSession | undefined;
-        await session?.triggerAction(type, msg);
+        await session?.triggerAction(...args);
     }
 }