chz-telegram-bot 0.2.1 → 0.3.1

package/dist/services/telegramApi.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelegramApiService = void 0;
 const responseProcessingQueue_1 = require("./responseProcessingQueue");
 class TelegramApiService {
-    constructor(botName, telegram, storage, logger) {
+    constructor(botName, telegram, storage, logger, captureRegistrationCallback) {
         this.queue = new responseProcessingQueue_1.ResponseProcessingQueue();
         this.telegram = telegram;
         this.botName = botName;
         this.storage = storage;
         this.logger = logger;
+        this.captureRegistrationCallback = captureRegistrationCallback;
     }
     enqueueBatchedResponses(responses) {
         let offset = 0;
@@ -45,7 +46,7 @@ class TelegramApiService {
         }
     }
     async processResponse(response) {
-        let sentMessage;
+        let sentMessage = null;
         switch (response.kind) {
             case 'text':
                 sentMessage = await this.telegram.sendMessage(response.chatInfo.id, response.content, {
@@ -60,31 +61,20 @@ class TelegramApiService {
                         is_disabled: response.disableWebPreview
                     }
                 });
-                await this.pinIfShould(response, sentMessage);
                 break;
             case 'image':
-                sentMessage = await this.telegram.sendPhoto(response.chatInfo.id, response.content, {
-                    reply_parameters: response.replyInfo
-                        ? {
-                            message_id: response.replyInfo.id,
-                            quote: response.replyInfo.quote
-                        }
-                        : undefined,
-                    parse_mode: 'MarkdownV2'
-                });
-                await this.pinIfShould(response, sentMessage);
+                sentMessage = await this.telegram.sendPhoto(response.chatInfo.id, response.content, response.replyInfo?.id
+                    ? {
+                        reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    : undefined);
                 break;
             case 'video':
-                sentMessage = await this.telegram.sendVideo(response.chatInfo.id, response.content, {
-                    reply_parameters: response.replyInfo
-                        ? {
-                            message_id: response.replyInfo.id,
-                            quote: response.replyInfo.quote
-                        }
-                        : undefined,
-                    parse_mode: 'MarkdownV2'
-                });
-                await this.pinIfShould(response, sentMessage);
+                sentMessage = await this.telegram.sendVideo(response.chatInfo.id, response.content, response.replyInfo?.id
+                    ? {
+                        reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    : undefined);
                 break;
             case 'react':
                 await this.telegram.setMessageReaction(response.chatInfo.id, response.messageId, [
@@ -106,6 +96,12 @@ class TelegramApiService {
             case 'delay':
                 break;
         }
+        if ('content' in response && sentMessage) {
+            await this.pinIfShould(response, sentMessage);
+            for (const capture of response.captures) {
+                this.captureRegistrationCallback(capture, sentMessage.message_id, response.chatInfo, response.traceId);
+            }
+        }
     }
 }
 exports.TelegramApiService = TelegramApiService;

package/dist/types/{actionWithState.d.ts → action.d.ts}

@@ -2,8 +2,10 @@ import { IActionState } from './actionState';
 export type ActionKey = string & {
     __brand: 'actionKey';
 };
-export interface IActionWithState<TActionState extends IActionState> {
-    readonly key: ActionKey;
+export interface IActionWithState<TActionState extends IActionState> extends IAction {
     readonly stateConstructor: () => TActionState;
 }
-//# sourceMappingURL=actionWithState.d.ts.map
+export interface IAction {
+    readonly key: ActionKey;
+}
+//# sourceMappingURL=action.d.ts.map

package/dist/types/action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../types/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB,CAAC,YAAY,SAAS,YAAY,CAC/D,SAAQ,OAAO;IACf,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;CAC3B"}

package/dist/types/capture.d.ts

@@ -0,0 +1,14 @@
+import { ReplyContext } from '../entities/context/replyContext';
+import { IActionState } from './actionState';
+import { CommandTrigger } from './commandTrigger';
+import { IActionWithState } from './action';
+export interface ICaptureController {
+    captureReplies: <TParentActionState extends IActionState>(trigger: CommandTrigger[], handler: (replyContext: ReplyContext<TParentActionState>) => Promise<void>, abortController: AbortController) => void;
+}
+export interface IReplyCapture {
+    trigger: CommandTrigger[];
+    handler: (replyContext: ReplyContext<IActionState>) => Promise<void>;
+    abortController: AbortController;
+    action: IActionWithState<IActionState>;
+}
+//# sourceMappingURL=capture.d.ts.map

package/dist/types/capture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,CAAC,kBAAkB,SAAS,YAAY,EACpD,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,EAClB,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C"}

package/dist/types/commandCondition.d.ts

@@ -1,4 +1,4 @@
 import { MessageContext } from '../entities/context/messageContext';
 import { IActionState } from './actionState';
-export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>) => boolean;
+export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>, state: TActionState) => boolean;
 //# sourceMappingURL=commandCondition.d.ts.map

package/dist/types/commandCondition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC"}
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC"}

package/dist/types/response.d.ts

@@ -6,10 +6,10 @@ import { Reaction } from '../dtos/responses/reaction';
 import { TextMessage } from '../dtos/responses/textMessage';
 import { UnpinResponse } from '../dtos/responses/unpin';
 import { VideoMessage } from '../dtos/responses/videoMessage';
-import { IActionState } from './actionState';
-import { ReplyInfo } from './replyInfo';
-import { IActionWithState } from './statefulAction';
+import { IReplyCapture } from './capture';
+import { ReplyInfo } from '../dtos/replyInfo';
 import { TraceId } from './trace';
+import { IAction } from './action';
 export declare const BotResponseTypes: {
     readonly unpin: "unpin";
     readonly text: "text";
@@ -25,12 +25,15 @@ export interface IChatResponse {
     readonly chatInfo: ChatInfo;
     readonly traceId: TraceId;
     readonly createdAt: number;
-    readonly action: IActionWithState<IActionState>;
+    readonly action: IAction;
 }
-export interface IReplyResponse<TType> extends IChatResponse {
-    readonly content: TType;
+export interface IReplyResponse extends IChatResponse {
+    readonly captures: IReplyCapture[];
     readonly replyInfo: ReplyInfo | undefined;
     readonly disableWebPreview: boolean;
     readonly shouldPin: boolean;
 }
+export interface IReplyResponseWithContent<TType> extends IReplyResponse {
+    readonly content: TType;
+}
 //# sourceMappingURL=response.d.ts.map

package/dist/types/response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,eAAO,MAAM,gBAAgB;;;;;;;;CAQnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,aAAa,GACb,mBAAmB,GACnB,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,cAAc,CAAC,KAAK,CAAE,SAAQ,aAAa;IACxD,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,eAAO,MAAM,gBAAgB;;;;;;;;CAQnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,aAAa,GACb,mBAAmB,GACnB,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,cAAe,SAAQ,aAAa;IACjD,QAAQ,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,yBAAyB,CAAC,KAAK,CAAE,SAAQ,cAAc;IACpE,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;CAC3B"}

package/dist/types/storage.d.ts

@@ -1,5 +1,5 @@
 import { IActionState } from './actionState';
-import { ActionKey, IActionWithState } from './statefulAction';
+import { ActionKey, IActionWithState } from './action';
 export interface IStorageClient {
     updateStateFor<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
     close(): Promise<void>;

package/dist/types/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/dtos/commandTriggerCheckResult.ts

@@ -5,6 +5,9 @@ export class CommandTriggerCheckResult {
     static get DoNotTrigger() {
         return new CommandTriggerCheckResult(false, [], false);
     }
+    static get Trigger() {
+        return new CommandTriggerCheckResult(true, [], false);
+    }
 
     readonly shouldExecute: boolean;
     readonly matchResults: RegExpExecArray[];

package/dtos/incomingMessage.ts

@@ -10,12 +10,13 @@ import { createTrace } from '../helpers/traceFactory';
 import { TraceId } from '../types/trace';
 
 export class IncomingMessage {
-    readonly message_id: number;
+    readonly messageId: number;
     readonly chatInfo: ChatInfo;
     readonly from: User | undefined;
     readonly text: string;
     readonly type: MessageTypeValue;
     readonly traceId: TraceId;
+    readonly replyToMessageId: number | undefined;
 
     readonly updateObject: TelegrafContextMessage;
 
@@ -44,7 +45,11 @@ export class IncomingMessage {
             botName,
             randomInt(10000, 99999).toString()
         );
-        this.message_id = ctxMessage.message_id;
+        this.messageId = ctxMessage.message_id;
+        this.replyToMessageId =
+            'reply_to_message' in ctxMessage
+                ? ctxMessage.reply_to_message?.message_id
+                : undefined;
         this.from = ctxMessage.from;
         this.text = 'text' in ctxMessage ? ctxMessage.text : '';
         this.chatInfo = new ChatInfo(

package/dtos/incomingQuery.ts

@@ -5,6 +5,7 @@ export class IncomingInlineQuery {
     readonly query: string;
     readonly userId: number;
     readonly traceId: TraceId;
+    readonly abortController: AbortController;
 
     constructor(
         queryId: string,
@@ -16,5 +17,6 @@ export class IncomingInlineQuery {
         this.query = query;
         this.userId = userId;
         this.traceId = traceId;
+        this.abortController = new AbortController();
     }
 }

package/dtos/responses/delay.ts

@@ -1,5 +1,5 @@
 import { IActionState } from '../../types/actionState';
-import { IActionWithState } from '../../types/statefulAction';
+import { IActionWithState } from '../../types/action';
 import { BotResponseTypes, IChatResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { TraceId } from '../../types/trace';

package/dtos/responses/imageMessage.ts

@@ -1,15 +1,19 @@
 import { InputFile } from 'telegraf/types';
-import { BotResponseTypes, IReplyResponse } from '../../types/response';
+import {
+    BotResponseTypes,
+    IReplyResponseWithContent
+} from '../../types/response';
 import { MessageSendingOptions } from '../../types/messageSendingOptions';
-import { IActionWithState } from '../../types/statefulAction';
-import { IActionState } from '../../types/actionState';
+import { IAction } from '../../types/action';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
-import { ReplyInfo } from '../../types/replyInfo';
+import { ReplyInfo } from '../replyInfo';
+import { IReplyCapture } from '../../types/capture';
 
-export class ImageMessage implements IReplyResponse<InputFile> {
+export class ImageMessage implements IReplyResponseWithContent<InputFile> {
     readonly kind = BotResponseTypes.image;
     readonly createdAt = Date.now();
+    readonly captures: IReplyCapture[] = [];
 
     readonly content: InputFile;
     readonly chatInfo: ChatInfo;
@@ -17,13 +21,13 @@ export class ImageMessage implements IReplyResponse<InputFile> {
     readonly traceId: TraceId;
     readonly disableWebPreview = false;
     readonly shouldPin: boolean;
-    readonly action: IActionWithState<IActionState>;
+    readonly action: IAction;
 
     constructor(
         image: InputFile,
         chatInfo: ChatInfo,
         traceId: TraceId,
-        action: IActionWithState<IActionState>,
+        action: IAction,
         replyInfo: ReplyInfo | undefined,
         options?: MessageSendingOptions
     ) {

package/dtos/responses/reaction.ts

@@ -1,7 +1,6 @@
 import { TelegramEmoji } from 'telegraf/types';
 import { BotResponseTypes, IChatResponse } from '../../types/response';
-import { IActionWithState } from '../../types/statefulAction';
-import { IActionState } from '../../types/actionState';
+import { IAction } from '../../types/action';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
 
@@ -13,14 +12,14 @@ export class Reaction implements IChatResponse {
     readonly messageId: number;
     readonly traceId: TraceId;
     readonly emoji: TelegramEmoji;
-    readonly action: IActionWithState<IActionState>;
+    readonly action: IAction;
 
     constructor(
         traceId: TraceId,
         chatInfo: ChatInfo,
         messageId: number,
         emoji: TelegramEmoji,
-        action: IActionWithState<IActionState>
+        action: IAction
     ) {
         this.chatInfo = chatInfo;
         this.messageId = messageId;

package/dtos/responses/textMessage.ts

@@ -1,14 +1,18 @@
 import { TextMessageSendingOptions } from '../../types/messageSendingOptions';
-import { BotResponseTypes, IReplyResponse } from '../../types/response';
-import { IActionWithState } from '../../types/statefulAction';
-import { IActionState } from '../../types/actionState';
+import {
+    BotResponseTypes,
+    IReplyResponseWithContent
+} from '../../types/response';
+import { IAction } from '../../types/action';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
-import { ReplyInfo } from '../../types/replyInfo';
+import { ReplyInfo } from '../replyInfo';
+import { IReplyCapture } from '../../types/capture';
 
-export class TextMessage implements IReplyResponse<string> {
+export class TextMessage implements IReplyResponseWithContent<string> {
     readonly kind = BotResponseTypes.text;
     readonly createdAt = Date.now();
+    readonly captures: IReplyCapture[] = [];
 
     readonly content: string;
     readonly chatInfo: ChatInfo;
@@ -16,13 +20,13 @@ export class TextMessage implements IReplyResponse<string> {
     readonly traceId: TraceId;
     readonly disableWebPreview: boolean;
     readonly shouldPin: boolean;
-    readonly action: IActionWithState<IActionState>;
+    readonly action: IAction;
 
     constructor(
         text: string,
         chatInfo: ChatInfo,
         traceId: TraceId,
-        action: IActionWithState<IActionState>,
+        action: IAction,
         replyInfo?: ReplyInfo,
         options?: TextMessageSendingOptions
     ) {

package/dtos/responses/unpin.ts

@@ -1,5 +1,5 @@
 import { BotResponseTypes, IChatResponse } from '../../types/response';
-import { IActionWithState } from '../../types/statefulAction';
+import { IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';

package/dtos/responses/videoMessage.ts

@@ -1,15 +1,19 @@
 import { InputFile } from 'telegraf/types';
-import { BotResponseTypes, IReplyResponse } from '../../types/response';
+import {
+    BotResponseTypes,
+    IReplyResponseWithContent
+} from '../../types/response';
 import { MessageSendingOptions } from '../../types/messageSendingOptions';
-import { IActionWithState } from '../../types/statefulAction';
-import { IActionState } from '../../types/actionState';
+import { IAction } from '../../types/action';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
-import { ReplyInfo } from '../../types/replyInfo';
+import { ReplyInfo } from '../replyInfo';
+import { IReplyCapture } from '../../types/capture';
 
-export class VideoMessage implements IReplyResponse<InputFile> {
+export class VideoMessage implements IReplyResponseWithContent<InputFile> {
     readonly kind = BotResponseTypes.video;
     readonly createdAt = Date.now();
+    readonly captures: IReplyCapture[] = [];
 
     readonly content: InputFile;
     readonly chatInfo: ChatInfo;
@@ -17,13 +21,13 @@ export class VideoMessage implements IReplyResponse<InputFile> {
     readonly traceId: TraceId;
     readonly disableWebPreview = false;
     readonly shouldPin: boolean;
-    readonly action: IActionWithState<IActionState>;
+    readonly action: IAction;
 
     constructor(
         video: InputFile,
         chatInfo: ChatInfo,
         traceId: TraceId,
-        action: IActionWithState<IActionState>,
+        action: IAction,
         replyInfo: ReplyInfo | undefined,
         options?: MessageSendingOptions
     ) {

package/entities/actions/commandAction.ts

@@ -5,7 +5,7 @@ import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
 import { toArray } from '../../helpers/toArray';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState, ActionKey } from '../../types/statefulAction';
+import { IActionWithState, ActionKey } from '../../types/action';
 import { CommandTriggerCheckResult } from '../../dtos/commandTriggerCheckResult';
 import { MessageContext } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
@@ -105,7 +105,7 @@ export class CommandAction<TActionState extends IActionState>
     private checkIfShouldBeExecuted(
         ctx: MessageContext<TActionState>,
         trigger: CommandTrigger,
-        state: IActionState
+        state: TActionState
     ) {
         if (!ctx.fromUserId)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
@@ -126,17 +126,11 @@ export class CommandAction<TActionState extends IActionState>
 
         if (onCooldown) return CommandTriggerCheckResult.DoNotTrigger;
 
-        const isCustomConditionMet = this.condition(ctx);
+        const isCustomConditionMet = this.condition(ctx, state);
         if (!isCustomConditionMet)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
 
-        const { shouldTrigger, matchResults } = this.checkTrigger(ctx, trigger);
-
-        return new CommandTriggerCheckResult(
-            shouldTrigger,
-            matchResults,
-            false
-        );
+        return this.checkTrigger(ctx, trigger);
     }
 
     private checkTrigger(
@@ -144,14 +138,12 @@ export class CommandAction<TActionState extends IActionState>
         trigger: CommandTrigger
     ) {
         if (trigger == ctx.messageType)
-            return { shouldTrigger: true, matchResults: [] };
+            return CommandTriggerCheckResult.Trigger;
 
         if (typeof trigger == 'string')
-            return {
-                shouldTrigger:
-                    ctx.messageText.toLowerCase() == trigger.toLowerCase(),
-                matchResults: []
-            };
+            return ctx.messageText.toLowerCase() == trigger.toLowerCase()
+                ? CommandTriggerCheckResult.Trigger
+                : CommandTriggerCheckResult.DoNotTrigger;
 
         const matchResults: RegExpExecArray[] = [];
 
@@ -170,9 +162,10 @@ export class CommandAction<TActionState extends IActionState>
             }
         }
 
-        return {
-            shouldTrigger: matchResults.length > 0,
-            matchResults
-        };
+        return new CommandTriggerCheckResult(
+            matchResults.length > 0,
+            matchResults,
+            false
+        );
     }
 }

package/entities/actions/inlineQueryAction.ts

@@ -1,10 +1,9 @@
 import { Noop } from '../../helpers/noop';
-import { ActionKey } from '../../types/statefulAction';
+import { ActionKey, IAction } from '../../types/action';
 import { InlineQueryContext } from '../context/inlineQueryContext';
 import { InlineQueryHandler } from '../../types/handlers';
-import { IActionWithoutState } from '../../types/statelessAction';
 
-export class InlineQueryAction implements IActionWithoutState {
+export class InlineQueryAction implements IAction {
     readonly key: ActionKey;
     readonly active: boolean;
     readonly handler: InlineQueryHandler;

package/entities/actions/replyCaptureAction.ts

@@ -0,0 +1,104 @@
+import { CommandTriggerCheckResult } from '../../dtos/commandTriggerCheckResult';
+import { Noop } from '../../helpers/noop';
+import { IActionState } from '../../types/actionState';
+import { CommandTrigger } from '../../types/commandTrigger';
+import { ActionKey, IAction, IActionWithState } from '../../types/action';
+import { ReplyContext } from '../context/replyContext';
+
+export class ReplyCaptureAction<TParentActionState extends IActionState>
+    implements IAction
+{
+    readonly parentMessageId: number;
+    readonly key: ActionKey;
+    readonly handler: (
+        replyContext: ReplyContext<TParentActionState>
+    ) => Promise<void>;
+    readonly triggers: CommandTrigger[];
+    readonly abortController: AbortController;
+
+    constructor(
+        parentMessageId: number,
+        parentAction: IActionWithState<TParentActionState>,
+        handler: (
+            replyContext: ReplyContext<TParentActionState>
+        ) => Promise<void>,
+        triggers: CommandTrigger[],
+        abortController: AbortController
+    ) {
+        this.parentMessageId = parentMessageId;
+        this.handler = handler;
+        this.triggers = triggers;
+        this.abortController = abortController;
+
+        this.key = `capture:${parentAction.key}:${Math.random()
+            .toString()
+            .replace('.', '')}` as ActionKey;
+    }
+
+    async exec(ctx: ReplyContext<TParentActionState>) {
+        if (!ctx.isInitialized)
+            throw new Error(
+                `Context for ${this.key} is not initialized or already consumed`
+            );
+
+        const { shouldExecute, matchResults } = this.triggers
+            .map((x) => this.checkIfShouldBeExecuted(ctx, x))
+            .reduce(
+                (acc, curr) => acc.mergeWith(curr),
+                CommandTriggerCheckResult.DoNotTrigger
+            );
+
+        if (!shouldExecute) return Noop.NoResponse;
+
+        ctx.logger.logWithTraceId(
+            ctx.botName,
+            ctx.traceId,
+            ctx.chatInfo.name,
+            ` - Executing [${this.key}] in ${ctx.chatInfo.id}`
+        );
+        ctx.matchResults = matchResults;
+
+        await this.handler(ctx);
+
+        return ctx.responses;
+    }
+
+    private checkIfShouldBeExecuted(
+        ctx: ReplyContext<TParentActionState>,
+        trigger: CommandTrigger
+    ) {
+        if (ctx.replyMessageId != this.parentMessageId)
+            return CommandTriggerCheckResult.DoNotTrigger;
+
+        if (trigger == ctx.messageType)
+            return CommandTriggerCheckResult.Trigger;
+
+        if (typeof trigger == 'string')
+            if (ctx.messageText.toLowerCase() == trigger.toLowerCase())
+                return CommandTriggerCheckResult.Trigger;
+            else return CommandTriggerCheckResult.DoNotTrigger;
+
+        const matchResults: RegExpExecArray[] = [];
+
+        trigger.lastIndex = 0;
+
+        const execResult = trigger.exec(ctx.messageText);
+        if (execResult != null) {
+            matchResults.push(execResult);
+
+            if (trigger.global) {
+                while (true) {
+                    const nextResult = trigger.exec(ctx.messageText);
+                    if (nextResult == null) break;
+                    matchResults.push(nextResult);
+                }
+            }
+        }
+
+        return new CommandTriggerCheckResult(
+            matchResults.length > 0,
+            matchResults,
+            false
+        );
+    }
+}

package/entities/actions/scheduledAction.ts

@@ -4,7 +4,7 @@ import { ScheduledHandler } from '../../types/handlers';
 import { hoursToMilliseconds } from '../../helpers/timeConvertions';
 import { HoursOfDay } from '../../types/timeValues';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState, ActionKey } from '../../types/statefulAction';
+import { IActionWithState, ActionKey } from '../../types/action';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
 import { Noop } from '../../helpers/noop';