chz-telegram-bot 0.3.3 → 0.3.4

package/dist/services/actionProcessors/commandActionProcessor.d.ts

@@ -17,7 +17,6 @@ export declare class CommandActionProcessor {
     private api;
     private telegraf;
     private commands;
-    private permanentTriggersToBeProcessed;
     constructor(botName: string, storage: IStorageClient, scheduler: IScheduler, logger: ILogger);
     initialize(api: TelegramApiService, telegraf: Telegraf, commands: CommandAction<IActionState>[], verboseLoggingForIncomingMessage: boolean): void;
     captureRegistrationCallback(capture: IReplyCapture, parentMessageId: number, chatInfo: ChatInfo, traceId: TraceId): void;

package/dist/services/actionProcessors/commandActionProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/commandActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAKrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IAEnE,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,QAAQ,CAAiC;IAEjD,OAAO,CAAC,8BAA8B,CAAe;gBAGjD,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAUnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO;IAoD7C,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YAgCN,cAAc;IAsC5B,OAAO,CAAC,6BAA6B;IA6BrC,OAAO,CAAC,wBAAwB;CA8BnC"}
+{"version":3,"file":"commandActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/commandActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAKrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAO/C,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqC;IAEnE,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,QAAQ,CAgBV;gBAGF,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAUnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO;IA0D7C,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YA+BN,cAAc;IAsC5B,OAAO,CAAC,6BAA6B;IA6BrC,OAAO,CAAC,wBAAwB;CA8BnC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -8,6 +8,22 @@ const replyContext_1 = require("../../entities/context/replyContext");
 const messageTypes_1 = require("../../types/messageTypes");
 class CommandActionProcessor {
     constructor(botName, storage, scheduler, logger) {
+        this.commands = {
+            '__msg:Any': [],
+            '__msg:Text': [],
+            '__msg:Sticker': [],
+            '__msg:Animation': [],
+            '__msg:Document': [],
+            '__msg:Voice': [],
+            '__msg:Audio': [],
+            '__msg:LeftChatMember': [],
+            '__msg:NewChatMember': [],
+            '__msg:Poll': [],
+            '__msg:Location': [],
+            '__msg:Photo': [],
+            '__msg:Forward': [],
+            '__msg:Unknown': []
+        };
         this.storage = storage;
         this.scheduler = scheduler;
         this.logger = logger;
@@ -17,15 +33,20 @@ class CommandActionProcessor {
     initialize(api, telegraf, commands, verboseLoggingForIncomingMessage) {
         this.api = api;
         this.telegraf = telegraf;
-        this.commands = commands;
-        if (this.commands.length > 0) {
-            this.permanentTriggersToBeProcessed = new Set(this.commands
-                .flatMap((x) => x.triggers)
-                .map((x) => typeof x == 'string'
-                ? x.startsWith(messageTypes_1.INTERNAL_MESSAGE_TYPE_PREFIX)
-                    ? x
-                    : messageTypes_1.MessageType.Text
-                : messageTypes_1.MessageType.Text));
+        for (const msgType of Object.values(messageTypes_1.MessageType)) {
+            if (msgType == messageTypes_1.MessageType.Text) {
+                this.commands[msgType] = commands.filter((cmd) => cmd.triggers.find((x) => typeof x != 'string') !=
+                    undefined ||
+                    cmd.triggers.find((x) => typeof x == 'string' &&
+                        !x.startsWith(messageTypes_1.INTERNAL_MESSAGE_TYPE_PREFIX)) ||
+                    cmd.triggers.includes(messageTypes_1.MessageType.Text) ||
+                    cmd.triggers.includes(messageTypes_1.MessageType.Any));
+                continue;
+            }
+            this.commands[msgType] = commands.filter((cmd) => cmd.triggers.includes(msgType) ||
+                cmd.triggers.includes(messageTypes_1.MessageType.Any));
+        }
+        if (commands.length > 0) {
             this.telegraf.on('message', async (ctx) => {
                 const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName);
                 const logger = this.logger.createScope(this.botName, msg.traceId, msg.chatInfo.name);
@@ -35,9 +56,7 @@ class CommandActionProcessor {
                 else {
                     logger.logWithTraceId(`${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || `<non-text message: ${msg.type}>`}`);
                 }
-                if (this.permanentTriggersToBeProcessed.has(msg.type) ||
-                    this.replyCaptures.find((x) => x.parentMessageId == msg.replyToMessageId))
-                    await this.processMessage(msg);
+                await this.processMessage(msg);
             });
         }
     }
@@ -54,7 +73,7 @@ class CommandActionProcessor {
     }
     async processMessage(msg) {
         const ctx = new messageContext_1.MessageContext(this.storage, this.scheduler);
-        for (const commandAction of this.commands) {
+        for (const commandAction of this.commands[msg.type]) {
             this.initializeMessageContext(ctx, commandAction, msg);
             try {
                 const responses = await commandAction.exec(ctx);

package/dist/types/messageTypes.d.ts

@@ -1,7 +1,7 @@
 import { Message, Update } from 'telegraf/types';
 export declare const INTERNAL_MESSAGE_TYPE_PREFIX = "__msg:";
 export declare const MessageType: {
-    readonly Any: "__msg:ANY";
+    readonly Any: "__msg:Any";
     readonly Text: "__msg:Text";
     readonly Sticker: "__msg:Sticker";
     readonly Animation: "__msg:Animation";

package/dist/types/messageTypes.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageType = exports.INTERNAL_MESSAGE_TYPE_PREFIX = void 0;
 exports.INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
 exports.MessageType = {
-    Any: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}ANY`,
+    Any: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Any`,
     Text: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
     Sticker: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
     Animation: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/actionProcessors/commandActionProcessor.ts

@@ -7,16 +7,17 @@ import { ReplyContext } from '../../entities/context/replyContext';
 import { IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
 import { ILogger } from '../../types/logger';
-import {
-    INTERNAL_MESSAGE_TYPE_PREFIX,
-    MessageType
-} from '../../types/messageTypes';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { TelegramApiService } from '../telegramApi';
 import { IReplyCapture } from '../../types/capture';
 import { TraceId } from '../../types/trace';
 import { ChatInfo } from '../../dtos/chatInfo';
+import {
+    INTERNAL_MESSAGE_TYPE_PREFIX,
+    MessageType,
+    MessageTypeValue
+} from '../../types/messageTypes';
 
 export class CommandActionProcessor {
     private readonly storage: IStorageClient;
@@ -28,9 +29,23 @@ export class CommandActionProcessor {
 
     private api!: TelegramApiService;
     private telegraf!: Telegraf;
-    private commands!: CommandAction<IActionState>[];
-
-    private permanentTriggersToBeProcessed!: Set<string>;
+    private commands: Record<MessageTypeValue, CommandAction<IActionState>[]> =
+        {
+            '__msg:Any': [],
+            '__msg:Text': [],
+            '__msg:Sticker': [],
+            '__msg:Animation': [],
+            '__msg:Document': [],
+            '__msg:Voice': [],
+            '__msg:Audio': [],
+            '__msg:LeftChatMember': [],
+            '__msg:NewChatMember': [],
+            '__msg:Poll': [],
+            '__msg:Location': [],
+            '__msg:Photo': [],
+            '__msg:Forward': [],
+            '__msg:Unknown': []
+        };
 
     constructor(
         botName: string,
@@ -54,21 +69,33 @@ export class CommandActionProcessor {
     ) {
         this.api = api;
         this.telegraf = telegraf;
-        this.commands = commands;
-
-        if (this.commands.length > 0) {
-            this.permanentTriggersToBeProcessed = new Set(
-                this.commands
-                    .flatMap((x) => x.triggers)
-                    .map((x) =>
-                        typeof x == 'string'
-                            ? x.startsWith(INTERNAL_MESSAGE_TYPE_PREFIX)
-                                ? x
-                                : MessageType.Text
-                            : MessageType.Text
-                    )
+
+        for (const msgType of Object.values(MessageType)) {
+            if (msgType == MessageType.Text) {
+                this.commands[msgType] = commands.filter(
+                    (cmd) =>
+                        cmd.triggers.find((x) => typeof x != 'string') !=
+                            undefined ||
+                        cmd.triggers.find(
+                            (x) =>
+                                typeof x == 'string' &&
+                                !x.startsWith(INTERNAL_MESSAGE_TYPE_PREFIX)
+                        ) ||
+                        cmd.triggers.includes(MessageType.Text) ||
+                        cmd.triggers.includes(MessageType.Any)
+                );
+
+                continue;
+            }
+
+            this.commands[msgType] = commands.filter(
+                (cmd) =>
+                    cmd.triggers.includes(msgType) ||
+                    cmd.triggers.includes(MessageType.Any)
             );
+        }
 
+        if (commands.length > 0) {
             this.telegraf.on('message', async (ctx) => {
                 const msg = new IncomingMessage(
                     ctx.update.message,
@@ -91,13 +118,7 @@ export class CommandActionProcessor {
                     );
                 }
 
-                if (
-                    this.permanentTriggersToBeProcessed.has(msg.type) ||
-                    this.replyCaptures.find(
-                        (x) => x.parentMessageId == msg.replyToMessageId
-                    )
-                )
-                    await this.processMessage(msg);
+                await this.processMessage(msg);
             });
         }
     }
@@ -137,14 +158,13 @@ export class CommandActionProcessor {
             );
         });
     }
-
     private async processMessage(msg: IncomingMessage) {
         const ctx = new MessageContext<IActionState>(
             this.storage,
             this.scheduler
         );
 
-        for (const commandAction of this.commands) {
+        for (const commandAction of this.commands[msg.type]) {
             this.initializeMessageContext(ctx, commandAction, msg);
 
             try {

package/types/messageTypes.ts

@@ -3,7 +3,7 @@ import { Message, Update } from 'telegraf/types';
 export const INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
 
 export const MessageType = {
-    Any: `${INTERNAL_MESSAGE_TYPE_PREFIX}ANY`,
+    Any: `${INTERNAL_MESSAGE_TYPE_PREFIX}Any`,
     Text: `${INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
     Sticker: `${INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
     Animation: `${INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,