chz-telegram-bot 0.1.20 → 0.2.1

package/services/telegramApi.ts

@@ -1,6 +1,6 @@
 import { Message } from 'telegraf/types';
 import { IStorageClient } from '../types/storage';
-import { BotResponse, IReplyMessage } from '../types/response';
+import { BotResponse, IReplyResponse } from '../types/response';
 import { Telegram } from 'telegraf/typings/telegram';
 import { ILogger } from '../types/logger';
 import { QueueItem, ResponseProcessingQueue } from './responseProcessingQueue';
@@ -60,7 +60,7 @@ export class TelegramApiService {
     }
 
     private async pinIfShould<T>(
-        response: IReplyMessage<T>,
+        response: IReplyResponse<T>,
         sentMessage: Message
     ) {
         if (response.shouldPin) {
@@ -89,11 +89,17 @@ export class TelegramApiService {
                     response.chatInfo.id,
                     response.content,
                     {
-                        reply_to_message_id: response.replyId,
+                        reply_parameters: response.replyInfo
+                            ? {
+                                  message_id: response.replyInfo.id,
+                                  quote: response.replyInfo.quote
+                              }
+                            : undefined,
                         parse_mode: 'MarkdownV2',
-                        disable_web_page_preview: response.disableWebPreview
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    } as any
+                        link_preview_options: {
+                            is_disabled: response.disableWebPreview
+                        }
+                    }
                 );
 
                 await this.pinIfShould(response, sentMessage);
@@ -102,10 +108,15 @@ export class TelegramApiService {
                 sentMessage = await this.telegram.sendPhoto(
                     response.chatInfo.id,
                     response.content,
-                    response.replyId
-                        ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                          ({ reply_to_message_id: response.replyId } as any)
-                        : undefined
+                    {
+                        reply_parameters: response.replyInfo
+                            ? {
+                                  message_id: response.replyInfo.id,
+                                  quote: response.replyInfo.quote
+                              }
+                            : undefined,
+                        parse_mode: 'MarkdownV2'
+                    }
                 );
 
                 await this.pinIfShould(response, sentMessage);
@@ -114,10 +125,15 @@ export class TelegramApiService {
                 sentMessage = await this.telegram.sendVideo(
                     response.chatInfo.id,
                     response.content,
-                    response.replyId
-                        ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                          ({ reply_to_message_id: response.replyId } as any)
-                        : undefined
+                    {
+                        reply_parameters: response.replyInfo
+                            ? {
+                                  message_id: response.replyInfo.id,
+                                  quote: response.replyInfo.quote
+                              }
+                            : undefined,
+                        parse_mode: 'MarkdownV2'
+                    }
                 );
 
                 await this.pinIfShould(response, sentMessage);

package/types/replyInfo.ts

@@ -0,0 +1,9 @@
+export class ReplyInfo {
+    readonly id: number;
+    readonly quote: string | undefined;
+
+    constructor(id: number, quote?: string) {
+        this.id = id;
+        this.quote = quote;
+    }
+}

package/types/response.ts

@@ -7,6 +7,7 @@ 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 { TraceId } from './trace';
 
@@ -38,9 +39,9 @@ export interface IChatResponse {
     readonly action: IActionWithState<IActionState>;
 }
 
-export interface IReplyMessage<TType> extends IChatResponse {
+export interface IReplyResponse<TType> extends IChatResponse {
     readonly content: TType;
-    readonly replyId: number | undefined;
+    readonly replyInfo: ReplyInfo | undefined;
     readonly disableWebPreview: boolean;
     readonly shouldPin: boolean;
 }