chz-telegram-bot 0.2.1 → 0.3.1

package/services/telegramApi.ts

@@ -4,12 +4,23 @@ import { BotResponse, IReplyResponse } from '../types/response';
 import { Telegram } from 'telegraf/typings/telegram';
 import { ILogger } from '../types/logger';
 import { QueueItem, ResponseProcessingQueue } from './responseProcessingQueue';
+import { IReplyCapture } from '../types/capture';
+import { IActionWithState } from '../types/action';
+import { IActionState } from '../types/actionState';
+import { TraceId } from '../types/trace';
+import { ChatInfo } from '../dtos/chatInfo';
 
 export class TelegramApiService {
     private readonly queue = new ResponseProcessingQueue();
     private readonly telegram: Telegram;
     private readonly storage: IStorageClient;
     private readonly logger: ILogger;
+    private readonly captureRegistrationCallback: (
+        capture: IReplyCapture,
+        parentMessageId: number,
+        chatInfo: ChatInfo,
+        traceId: TraceId
+    ) => void;
 
     private readonly botName: string;
 
@@ -17,12 +28,19 @@ export class TelegramApiService {
         botName: string,
         telegram: Telegram,
         storage: IStorageClient,
-        logger: ILogger
+        logger: ILogger,
+        captureRegistrationCallback: (
+            capture: IReplyCapture,
+            parentMessageId: number,
+            chatInfo: ChatInfo,
+            traceId: TraceId
+        ) => void
     ) {
         this.telegram = telegram;
         this.botName = botName;
         this.storage = storage;
         this.logger = logger;
+        this.captureRegistrationCallback = captureRegistrationCallback;
     }
 
     enqueueBatchedResponses(responses: BotResponse[]) {
@@ -59,10 +77,7 @@ export class TelegramApiService {
         this.queue.flushReadyItems();
     }
 
-    private async pinIfShould<T>(
-        response: IReplyResponse<T>,
-        sentMessage: Message
-    ) {
+    private async pinIfShould(response: IReplyResponse, sentMessage: Message) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(
                 response.chatInfo.id,
@@ -71,7 +86,7 @@ export class TelegramApiService {
             );
 
             await this.storage.updateStateFor(
-                response.action,
+                response.action as IActionWithState<IActionState>,
                 response.chatInfo.id,
                 async (state) => {
                     state.pinnedMessages.push(sentMessage.message_id);
@@ -81,7 +96,7 @@ export class TelegramApiService {
     }
 
     private async processResponse(response: BotResponse) {
-        let sentMessage: Message;
+        let sentMessage: Message | null = null;
 
         switch (response.kind) {
             case 'text':
@@ -101,42 +116,28 @@ export class TelegramApiService {
                         }
                     }
                 );
-
-                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'
-                    }
+                    response.replyInfo?.id
+                        ? ({
+                              reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                          } as any)
+                        : undefined
                 );
-
-                await this.pinIfShould(response, sentMessage);
                 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'
-                    }
+                    response.replyInfo?.id
+                        ? ({
+                              reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                          } as any)
+                        : undefined
                 );
-
-                await this.pinIfShould(response, sentMessage);
                 break;
             case 'react':
                 await this.telegram.setMessageReaction(
@@ -178,5 +179,18 @@ export 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
+                );
+            }
+        }
     }
 }

package/types/{statefulAction.ts → action.ts}

@@ -2,7 +2,11 @@ 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;
 }
+
+export interface IAction {
+    readonly key: ActionKey;
+}

package/types/capture.ts

@@ -0,0 +1,21 @@
+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>;
+}

package/types/commandCondition.ts

@@ -2,5 +2,6 @@ import { MessageContext } from '../entities/context/messageContext';
 import { IActionState } from './actionState';
 
 export type CommandCondition<TActionState extends IActionState> = (
-    ctx: MessageContext<TActionState>
+    ctx: MessageContext<TActionState>,
+    state: TActionState
 ) => boolean;

package/types/response.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 const BotResponseTypes = {
     unpin: 'unpin',
@@ -36,12 +36,16 @@ export interface IChatResponse {
     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;
+}

package/types/storage.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>(

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

@@ -1 +0,0 @@
-{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.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;IAC/D,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"replyInfo.d.ts","sourceRoot":"","sources":["../../types/replyInfo.ts"],"names":[],"mappings":"AAAA,qBAAa,SAAS;IAClB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEvB,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;CAIzC"}

package/dist/types/statefulAction.d.ts

@@ -1,9 +0,0 @@
-import { IActionState } from './actionState';
-export type ActionKey = string & {
-    __brand: 'actionKey';
-};
-export interface IActionWithState<TActionState extends IActionState> {
-    readonly key: ActionKey;
-    readonly stateConstructor: () => TActionState;
-}
-//# sourceMappingURL=statefulAction.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"statefulAction.d.ts","sourceRoot":"","sources":["../../types/statefulAction.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;IAC/D,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD"}

package/dist/types/statelessAction.d.ts

@@ -1,5 +0,0 @@
-import { ActionKey } from './statefulAction';
-export interface IActionWithoutState {
-    readonly key: ActionKey;
-}
-//# sourceMappingURL=statelessAction.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"statelessAction.d.ts","sourceRoot":"","sources":["../../types/statelessAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;CAC3B"}

package/dist/types/statelessAction.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/types/statelessAction.ts

@@ -1,5 +0,0 @@
-import { ActionKey } from './statefulAction';
-
-export interface IActionWithoutState {
-    readonly key: ActionKey;
-}