chz-telegram-bot 0.3.16 → 0.3.17

package/dist/dtos/incomingMessage.d.ts

@@ -13,5 +13,6 @@ export declare class IncomingMessage {
     readonly updateObject: TelegrafContextMessage;
     private detectMessageType;
     constructor(ctxMessage: TelegrafContextMessage, botName: string, history: IncomingMessage[]);
+    private getMessageText;
 }
 //# sourceMappingURL=incomingMessage.d.ts.map

package/dist/dtos/incomingMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAEH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,eAAe;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAE9C,OAAO,CAAC,iBAAiB;gBAqBrB,UAAU,EAAE,sBAAsB,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE;CA6BjC"}
+{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAEH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,eAAe;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAE9C,OAAO,CAAC,iBAAiB;gBAqBrB,UAAU,EAAE,sBAAsB,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE;IAyB9B,OAAO,CAAC,cAAc;CAKzB"}

package/dist/dtos/incomingMessage.js

@@ -51,17 +51,17 @@ class IncomingMessage {
                 ? ctxMessage.reply_to_message?.message_id
                 : undefined;
         this.from = ctxMessage.from;
-        this.text =
-            'text' in ctxMessage
-                ? ctxMessage.text
-                : 'caption' in ctxMessage
-                    ? ctxMessage.caption ?? ''
-                    : '';
+        this.text = this.getMessageText(ctxMessage);
         this.chatInfo = new chatInfo_1.ChatInfo(ctxMessage.chat.id, 'title' in ctxMessage.chat
             ? `${ctxMessage.chat.title} ${ctxMessage.chat.id}`
             : 'DM', history);
         this.type = this.detectMessageType(ctxMessage);
         this.updateObject = ctxMessage;
     }
+    getMessageText(ctxMessage) {
+        if ('text' in ctxMessage)
+            return ctxMessage.text;
+        return 'caption' in ctxMessage ? ctxMessage.caption ?? '' : '';
+    }
 }
 exports.IncomingMessage = IncomingMessage;

package/dist/entities/actions/replyCaptureAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replyCaptureAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/replyCaptureAction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,qBAAa,kBAAkB,CAAC,kBAAkB,SAAS,YAAY,CACnE,YAAW,OAAO;IAElB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,CACd,YAAY,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KACrD,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAGtC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EAClD,OAAO,EAAE,CACL,YAAY,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KACrD,OAAO,CAAC,IAAI,CAAC,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,eAAe,EAAE,eAAe;IAY9B,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,kBAAkB,CAAC;IAyBxD,OAAO,CAAC,uBAAuB;CA+ClC"}
+{"version":3,"file":"replyCaptureAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/replyCaptureAction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,qBAAa,kBAAkB,CAAC,kBAAkB,SAAS,YAAY,CACnE,YAAW,OAAO;IAElB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,CACd,YAAY,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KACrD,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAGtC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EAClD,OAAO,EAAE,CACL,YAAY,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KACrD,OAAO,CAAC,IAAI,CAAC,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,eAAe,EAAE,eAAe;IAY9B,IAAI,CAAC,GAAG,EAAE,oBAAoB,CAAC,kBAAkB,CAAC;IAyBxD,OAAO,CAAC,uBAAuB;CA4ClC"}

package/dist/entities/actions/replyCaptureAction.js

@@ -37,10 +37,9 @@ class ReplyCaptureAction {
         if (trigger == ctx.messageInfo.type)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
         if (typeof trigger == 'string')
-            if (ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase())
-                return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
-            else
-                return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
+            return ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase()
+                ? commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger()
+                : commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
         const matchResults = [];
         trigger.lastIndex = 0;
         const execResult = trigger.exec(ctx.messageInfo.text);

package/dist/entities/context/messageContext.d.ts

@@ -44,21 +44,21 @@ export declare class MessageContextInternal<TActionState extends IActionState> e
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => import("../../types/capture").ICaptureController;
+            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => import("../..").ICaptureController;
             /**
              * Reply with image message to message that triggered this action after action execution is finished.
              * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withImage: (name: string, quote?: string, options?: MessageSendingOptions) => import("../../types/capture").ICaptureController;
+            withImage: (name: string, quote?: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
             /**
              * Reply with video/gif message to message that triggered this action after action execution is finished.
              * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withVideo: (name: string, quote?: string, options?: MessageSendingOptions) => import("../../types/capture").ICaptureController;
+            withVideo: (name: string, quote?: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         };
         /**
          * Reply with text message to message that triggered this action after action execution is finished.
@@ -66,21 +66,21 @@ export declare class MessageContextInternal<TActionState extends IActionState> e
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withText: (text: string, options?: TextMessageSendingOptions) => import("../../types/capture").ICaptureController;
+        withText: (text: string, options?: TextMessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Reply with image message to message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withImage: (name: string, options?: MessageSendingOptions) => import("../../types/capture").ICaptureController;
+        withImage: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Reply with video/gif message to message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withVideo: (name: string, options?: MessageSendingOptions) => import("../../types/capture").ICaptureController;
+        withVideo: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         /**
          * React to the message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.

package/dist/entities/context/messageContext.js

@@ -24,11 +24,11 @@ class MessageContextInternal extends chatContext_1.ChatContextInternal {
     botInfo;
     customCooldown;
     getQuotePart(quote) {
-        return typeof quote == 'boolean'
-            ? this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageInfo.text
-            : quote;
+        if (typeof quote != 'boolean')
+            return quote;
+        return this.matchResults.length != 0
+            ? this.matchResults[0][1]
+            : this.messageInfo.text;
     }
     replyWithText(text, quote, options) {
         const quotedPart = this.getQuotePart(quote);

package/dist/entities/context/replyContext.js

@@ -21,11 +21,11 @@ class ReplyContextInternal extends baseContext_1.BaseContextInternal {
     botInfo;
     isInitialized = false;
     getQuotePart(quote) {
-        return typeof quote == 'boolean'
-            ? this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageInfo.text
-            : quote;
+        if (typeof quote != 'boolean')
+            return quote;
+        return this.matchResults.length != 0
+            ? this.matchResults[0][1]
+            : this.messageInfo.text;
     }
     replyWithText(text, quote, options) {
         const quotedPart = this.getQuotePart(quote);

package/dist/helpers/builders/commandActionBuilder.js

@@ -101,7 +101,7 @@ class CommandActionBuilderWithState {
     }
     /** Builds action */
     build() {
-        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, new cooldownInfo_1.CooldownInfo(this.cooldownSeconds, this.cooldownMessage), this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory != null ? this.readmeFactory : (_) => '');
+        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, new cooldownInfo_1.CooldownInfo(this.cooldownSeconds, this.cooldownMessage), this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory ?? noop_1.Noop.emptyString);
     }
 }
 exports.CommandActionBuilderWithState = CommandActionBuilderWithState;

package/dist/helpers/noop.d.ts

@@ -1,8 +1,9 @@
 import { BotResponse } from '../types/response';
 export declare class Noop {
-    static NoResponse: BotResponse[];
+    static readonly NoResponse: BotResponse[];
     static true(arg1: unknown): boolean;
     static false(arg1: unknown): boolean;
+    static emptyString(): string;
     static call(arg1: unknown): Promise<void>;
 }
 //# sourceMappingURL=noop.d.ts.map

package/dist/helpers/noop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noop.d.ts","sourceRoot":"","sources":["../../helpers/noop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,qBAAa,IAAI;IACb,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE,CAAM;IACtC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO;IAGzB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO;WAIb,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAElD"}
+{"version":3,"file":"noop.d.ts","sourceRoot":"","sources":["../../helpers/noop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,qBAAa,IAAI;IACb,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAAM;IAC/C,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO;IAGzB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO;IAG1B,MAAM,CAAC,WAAW;WAGL,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAIlD"}

package/dist/helpers/noop.js

@@ -11,6 +11,11 @@ class Noop {
     static false(arg1) {
         return false;
     }
-    static async call(arg1, arg2) { }
+    static emptyString() {
+        return '';
+    }
+    static async call(arg1, arg2) {
+        return Promise.resolve();
+    }
 }
 exports.Noop = Noop;

package/dist/index.d.ts

@@ -15,4 +15,5 @@ export { ChatContext } from './entities/context/chatContext';
 export { InlineQueryContext } from './entities/context/inlineQueryContext';
 export { MessageContext } from './entities/context/messageContext';
 export { ReplyContext } from './entities/context/replyContext';
+export { ICaptureController } from './types/capture';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,6CAA6C,CAAC;AAC5D,cAAc,yCAAyC,CAAC;AACxD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,6CAA6C,CAAC;AAC5D,cAAc,yCAAyC,CAAC;AACxD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC"}

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

@@ -9,8 +9,8 @@ import { BaseActionProcessor } from './baseProcessor';
 import { UserFromGetMe } from 'telegraf/types';
 export declare class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures;
+    private readonly chatHistory;
     private botInfo;
-    private lastMessages;
     private commands;
     initialize(api: TelegramApiService, telegraf: Telegraf, commands: CommandAction<IActionState>[], verboseLoggingForIncomingMessage: boolean, botInfo: UserFromGetMe): 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;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,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;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAO/C,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,YAAY,CAAwC;IAE5D,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO,EACzC,OAAO,EAAE,aAAa;IA2D1B,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YA+BN,cAAc;IA0C5B,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,wBAAwB;CAmCnC"}
+{"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;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,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;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAO/C,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwC;IACpE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO,EACzC,OAAO,EAAE,aAAa;IA2D1B,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YAgCN,cAAc;IA2C5B,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,wBAAwB;CAmCnC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -14,8 +14,8 @@ const userInfo_1 = require("../../dtos/userInfo");
 const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
     replyCaptures = [];
+    chatHistory = new Map();
     botInfo;
-    lastMessages = new Map();
     commands = (0, objectFromEntries_1.typeSafeObjectFromEntries)(Object.values(messageTypes_1.MessageType).map((x) => [
         x,
         []
@@ -38,13 +38,13 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         }
         if (commands.length > 0) {
             telegraf.on('message', (ctx) => {
-                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName, (0, mapUtils_1.getOrSetIfNotExists)(this.lastMessages, ctx.chat.id, []));
+                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName, (0, mapUtils_1.getOrSetIfNotExists)(this.chatHistory, ctx.chat.id, []));
                 const logger = this.logger.createScope(this.botName, msg.traceId, msg.chatInfo.name);
                 if (verboseLoggingForIncomingMessage) {
                     logger.logObjectWithTraceId(ctx.update.message);
                 }
                 else {
-                    logger.logWithTraceId(`${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || `<non-text message: ${msg.type}>`}`);
+                    logger.logWithTraceId(`${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || msg.type}`);
                 }
                 void this.processMessage(msg);
             });
@@ -62,10 +62,10 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         });
     }
     async processMessage(msg) {
-        const messageHistoryArray = (0, mapUtils_1.getOrSetIfNotExists)(this.lastMessages, msg.chatInfo.id, []);
-        if (messageHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
-            messageHistoryArray.shift();
-        messageHistoryArray.push(msg);
+        const chatHistoryArray = (0, mapUtils_1.getOrSetIfNotExists)(this.chatHistory, msg.chatInfo.id, []);
+        while (chatHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
+            chatHistoryArray.shift();
+        chatHistoryArray.push(msg);
         const ctx = new messageContext_1.MessageContextInternal(this.storage, this.scheduler);
         const commandsToCheck = new Set(this.commands[msg.type]);
         if (msg.type != messageTypes_1.MessageType.Text && msg.text != '') {

package/dist/services/jsonLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAQtB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG;IAQb,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAQ1B"}
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAQtB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG;IAQb,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAY1B"}

package/dist/services/jsonLogger.js

@@ -32,7 +32,10 @@ class JsonLogger {
         console.log(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","text":"${text}"}`);
     }
     errorWithTraceId(botName, traceId, chatName, errorObj, extraData) {
-        console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${extraData ? `,"extraData":${JSON.stringify(extraData)}` : ''}}`);
+        const dataString = extraData
+            ? `,"extraData":${JSON.stringify(extraData)}`
+            : '';
+        console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${dataString}}`);
     }
 }
 exports.JsonLogger = JsonLogger;

package/dtos/incomingMessage.ts

@@ -56,12 +56,7 @@ export class IncomingMessage {
                 ? ctxMessage.reply_to_message?.message_id
                 : undefined;
         this.from = ctxMessage.from;
-        this.text =
-            'text' in ctxMessage
-                ? ctxMessage.text
-                : 'caption' in ctxMessage
-                ? ctxMessage.caption ?? ''
-                : '';
+        this.text = this.getMessageText(ctxMessage);
         this.chatInfo = new ChatInfo(
             ctxMessage.chat.id,
             'title' in ctxMessage.chat
@@ -72,4 +67,10 @@ export class IncomingMessage {
         this.type = this.detectMessageType(ctxMessage);
         this.updateObject = ctxMessage;
     }
+
+    private getMessageText(ctxMessage: TelegrafContextMessage) {
+        if ('text' in ctxMessage) return ctxMessage.text;
+
+        return 'caption' in ctxMessage ? ctxMessage.caption ?? '' : '';
+    }
 }

package/entities/actions/replyCaptureAction.ts

@@ -73,12 +73,9 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
             return CommandTriggerCheckResult.Trigger();
 
         if (typeof trigger == 'string')
-            if (ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase())
-                return CommandTriggerCheckResult.Trigger();
-            else
-                return CommandTriggerCheckResult.DoNotTrigger(
-                    'TriggerNotSatisfied'
-                );
+            return ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase()
+                ? CommandTriggerCheckResult.Trigger()
+                : CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
 
         const matchResults: RegExpExecArray[] = [];
 

package/entities/context/messageContext.ts

@@ -41,11 +41,11 @@ export class MessageContextInternal<
     customCooldown: Seconds | undefined;
 
     private getQuotePart(quote: boolean | string) {
-        return typeof quote == 'boolean'
-            ? this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageInfo.text
-            : quote;
+        if (typeof quote != 'boolean') return quote;
+
+        return this.matchResults.length != 0
+            ? this.matchResults[0][1]
+            : this.messageInfo.text;
     }
 
     private replyWithText(

package/entities/context/replyContext.ts

@@ -43,11 +43,11 @@ export class ReplyContextInternal<
     isInitialized = false;
 
     private getQuotePart(quote: boolean | string) {
-        return typeof quote == 'boolean'
-            ? this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageInfo.text
-            : quote;
+        if (typeof quote != 'boolean') return quote;
+
+        return this.matchResults.length != 0
+            ? this.matchResults[0][1]
+            : this.messageInfo.text;
     }
 
     private replyWithText(

package/helpers/builders/commandActionBuilder.ts

@@ -138,7 +138,7 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
             this.maxAllowedSimultaniousExecutions,
             this.condition,
             this.stateConstructor,
-            this.readmeFactory != null ? this.readmeFactory : (_) => ''
+            this.readmeFactory ?? Noop.emptyString
         );
     }
 }

package/helpers/noop.ts

@@ -3,14 +3,18 @@ import { BotResponse } from '../types/response';
 /* eslint-disable @typescript-eslint/no-unused-vars */
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class Noop {
-    static NoResponse: BotResponse[] = [];
+    static readonly NoResponse: BotResponse[] = [];
     static true(arg1: unknown) {
         return true;
     }
     static false(arg1: unknown) {
         return false;
     }
-
+    static emptyString() {
+        return '';
+    }
     static async call(arg1: unknown): Promise<void>;
-    static async call(arg1: unknown, arg2?: unknown) {}
+    static async call(arg1: unknown, arg2?: unknown) {
+        return Promise.resolve();
+    }
 }

package/index.ts

@@ -15,3 +15,4 @@ export { ChatContext } from './entities/context/chatContext';
 export { InlineQueryContext } from './entities/context/inlineQueryContext';
 export { MessageContext } from './entities/context/messageContext';
 export { ReplyContext } from './entities/context/replyContext';
+export { ICaptureController } from './types/capture';

package/package.json

@@ -14,7 +14,7 @@
         "type": "git",
         "url": "https://github.com/AlexSolari/botFramework.git"
     },
-    "version": "0.3.16",
+    "version": "0.3.17",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/actionProcessors/commandActionProcessor.ts

@@ -24,8 +24,8 @@ const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 
 export class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures: ReplyCaptureAction<IActionState>[] = [];
+    private readonly chatHistory = new Map<number, IncomingMessage[]>();
     private botInfo!: UserFromGetMe;
-    private lastMessages = new Map<number, IncomingMessage[]>();
 
     private commands = typeSafeObjectFromEntries(
         Object.values(MessageType).map((x) => [
@@ -74,7 +74,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
                 const msg = new IncomingMessage(
                     ctx.update.message,
                     this.botName,
-                    getOrSetIfNotExists(this.lastMessages, ctx.chat.id, [])
+                    getOrSetIfNotExists(this.chatHistory, ctx.chat.id, [])
                 );
 
                 const logger = this.logger.createScope(
@@ -89,7 +89,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
                     logger.logWithTraceId(
                         `${msg.from?.first_name ?? 'Unknown'} (${
                             msg.from?.id ?? 'Unknown'
-                        }): ${msg.text || `<non-text message: ${msg.type}>`}`
+                        }): ${msg.text || msg.type}`
                     );
                 }
 
@@ -133,15 +133,17 @@ export class CommandActionProcessor extends BaseActionProcessor {
             );
         });
     }
+
     private async processMessage(msg: IncomingMessage) {
-        const messageHistoryArray = getOrSetIfNotExists(
-            this.lastMessages,
+        const chatHistoryArray = getOrSetIfNotExists(
+            this.chatHistory,
             msg.chatInfo.id,
             []
         );
-        if (messageHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
-            messageHistoryArray.shift();
-        messageHistoryArray.push(msg);
+
+        while (chatHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
+            chatHistoryArray.shift();
+        chatHistoryArray.push(msg);
 
         const ctx = new MessageContextInternal<IActionState>(
             this.storage,

package/services/jsonLogger.ts

@@ -62,10 +62,14 @@ export class JsonLogger implements ILogger {
         errorObj: unknown,
         extraData?: unknown
     ) {
+        const dataString = extraData
+            ? `,"extraData":${JSON.stringify(extraData)}`
+            : '';
+
         console.error(
             `{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(
                 errorObj
-            )}${extraData ? `,"extraData":${JSON.stringify(extraData)}` : ''}}`
+            )}${dataString}}`
         );
     }
 }