chz-telegram-bot 0.3.5 → 0.3.7

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;gBAoBb,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM;CAsBlE"}
+{"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;gBAoBb,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM;CA2BlE"}

package/dist/dtos/incomingMessage.js

@@ -43,7 +43,12 @@ class IncomingMessage {
                 ? ctxMessage.reply_to_message?.message_id
                 : undefined;
         this.from = ctxMessage.from;
-        this.text = 'text' in ctxMessage ? ctxMessage.text : '';
+        this.text =
+            'text' in ctxMessage
+                ? ctxMessage.text
+                : 'caption' in ctxMessage
+                    ? ctxMessage.caption ?? ''
+                    : '';
         this.chatInfo = new chatInfo_1.ChatInfo(ctxMessage.chat.id, 'title' in ctxMessage.chat
             ? ctxMessage.chat.title + ' ' + ctxMessage.chat.id
             : 'DM');

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

@@ -26,6 +26,7 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     /** Message object recieved from Telegram */
     messageUpdateObject: TelegrafContextMessage;
     constructor(storage: IStorageClient, scheduler: IScheduler);
+    private getQuotePart;
     private replyWithText;
     private replyWithImage;
     private replyWithVideo;
@@ -44,21 +45,21 @@ export declare class MessageContext<TActionState extends IActionState> extends C
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, options?: TextMessageSendingOptions) => import("../../types/capture").ICaptureController;
+            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => import("../../types/capture").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, quote?: string, options?: MessageSendingOptions) => import("../../types/capture").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, quote?: string, options?: MessageSendingOptions) => import("../../types/capture").ICaptureController;
         };
         /**
          * Reply with text message to message that triggered this action after action execution is finished.

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

@@ -1 +1 @@
-{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,4HAA4H;IAC5H,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kGAAkG;IAClG,aAAa,EAAE,OAAO,CAAQ;IAC9B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;IAC/B,4CAA4C;IAC5C,mBAAmB,EAAG,sBAAsB,CAAC;gBAEjC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAI1D,OAAO,CAAC,aAAa;IAwBrB,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,cAAc;IAwBtB;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BACc,MAAM,YAAY,yBAAyB;YAE5D;;;;;eAKG;8BACe,MAAM,YAAY,qBAAqB;YAGzD;;;;;eAKG;8BACe,MAAM,YAAY,qBAAqB;;QAI7D;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAE5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,4HAA4H;IAC5H,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kGAAkG;IAClG,aAAa,EAAE,OAAO,CAAQ;IAC9B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;IAC/B,4CAA4C;IAC5C,mBAAmB,EAAG,sBAAsB,CAAC;gBAEjC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAI1D,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,cAAc;IAqBtB;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BAEO,MAAM,UACJ,MAAM,YACJ,yBAAyB;YAEvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAGnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAIvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAE5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}

package/dist/entities/context/messageContext.js

@@ -33,21 +33,21 @@ class MessageContext extends chatContext_1.ChatContext {
                  * @param text Message contents.
                  * @param options Message sending option.
                  */
-                withText: (text, options) => this.replyWithText(text, true, options),
+                withText: (text, quote, options) => this.replyWithText(text, quote ?? true, options),
                 /**
                  * 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, options) => this.replyWithImage(name, true, options),
+                withImage: (name, quote, options) => this.replyWithImage(name, quote ?? true, options),
                 /**
                  * 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, options) => this.replyWithVideo(name, true, options)
+                withVideo: (name, quote, options) => this.replyWithVideo(name, quote ?? true, options)
             },
             /**
              * Reply with text message to message that triggered this action after action execution is finished.
@@ -80,26 +80,27 @@ class MessageContext extends chatContext_1.ChatContext {
             }
         };
     }
+    getQuotePart(quote) {
+        return typeof quote == 'boolean'
+            ? this.matchResults.length != 0
+                ? this.matchResults[0][1]
+                : this.messageText
+            : quote;
+    }
     replyWithText(text, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new textMessage_1.TextMessage(text, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
         return this.createCaptureController(response);
     }
     replyWithImage(name, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(`./content/${name}.png`) }, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
         return this.createCaptureController(response);
     }
     replyWithVideo(name, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(`./content/${name}.mp4`) }, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
         return this.createCaptureController(response);

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

@@ -43,6 +43,7 @@ export declare class ReplyContext<TParentActionState extends IActionState> {
     messageUpdateObject: TelegrafContextMessage;
     isInitialized: boolean;
     constructor(storage: IStorageClient, scheduler: IScheduler);
+    private getQuotePart;
     private replyWithText;
     private replyWithImage;
     private replyWithVideo;
@@ -65,21 +66,21 @@ export declare class ReplyContext<TParentActionState extends IActionState> {
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, options?: TextMessageSendingOptions) => void;
+            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => void;
             /**
              * 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) => void;
+            withImage: (name: string, quote?: string, options?: MessageSendingOptions) => void;
             /**
              * 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) => void;
+            withVideo: (name: string, quote?: string, options?: MessageSendingOptions) => void;
         };
         /**
          * Reply with text message to message that triggered this action after action execution is finished.

package/dist/entities/context/replyContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replyContext.d.ts","sourceRoot":"","sources":["../../../entities/context/replyContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,qBAAa,YAAY,CAAC,kBAAkB,SAAS,YAAY;IAC7D,MAAM,EAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAEhD,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B,sCAAsC;IACtC,OAAO,EAAG,OAAO,CAAC;IAClB,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wDAAwD;IACxD,MAAM,EAAG,aAAa,CAAC;IAEvB,uDAAuD;IACvD,SAAS,EAAE,WAAW,EAAE,CAAM;IAC9B,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IACpB,4HAA4H;IAC5H,YAAY,EAAG,eAAe,EAAE,CAAC;IACjC,kDAAkD;IAClD,cAAc,EAAG,MAAM,GAAG,SAAS,CAAC;IACpC,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;IAC/B,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,4CAA4C;IAC5C,mBAAmB,EAAG,sBAAsB,CAAC;IAE7C,aAAa,UAAS;gBAEV,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAK1D,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,cAAc;IAsBtB;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BACc,MAAM,YAAY,yBAAyB;YAE5D;;;;;eAKG;8BACe,MAAM,YAAY,qBAAqB;YAGzD;;;;;eAKG;8BACe,MAAM,YAAY,qBAAqB;;QAI7D;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAE5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}
+{"version":3,"file":"replyContext.d.ts","sourceRoot":"","sources":["../../../entities/context/replyContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGnE,qBAAa,YAAY,CAAC,kBAAkB,SAAS,YAAY;IAC7D,MAAM,EAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IAEhD,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B,sCAAsC;IACtC,OAAO,EAAG,OAAO,CAAC;IAClB,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wDAAwD;IACxD,MAAM,EAAG,aAAa,CAAC;IAEvB,uDAAuD;IACvD,SAAS,EAAE,WAAW,EAAE,CAAM;IAC9B,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IACpB,4HAA4H;IAC5H,YAAY,EAAG,eAAe,EAAE,CAAC;IACjC,kDAAkD;IAClD,cAAc,EAAG,MAAM,GAAG,SAAS,CAAC;IACpC,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;IAC/B,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,4CAA4C;IAC5C,mBAAmB,EAAG,sBAAsB,CAAC;IAE7C,aAAa,UAAS;gBAEV,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAK1D,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,cAAc;IAmBtB;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BAEO,MAAM,UACJ,MAAM,YACJ,yBAAyB;YAEvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAGnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAIvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAE5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAGzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}

package/dist/entities/context/replyContext.js

@@ -27,21 +27,21 @@ class ReplyContext {
                  * @param text Message contents.
                  * @param options Message sending option.
                  */
-                withText: (text, options) => this.replyWithText(text, true, options),
+                withText: (text, quote, options) => this.replyWithText(text, quote ?? true, options),
                 /**
                  * 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, options) => this.replyWithImage(name, true, options),
+                withImage: (name, quote, options) => this.replyWithImage(name, quote ?? true, options),
                 /**
                  * 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, options) => this.replyWithVideo(name, true, options)
+                withVideo: (name, quote, options) => this.replyWithVideo(name, quote ?? true, options)
             },
             /**
              * Reply with text message to message that triggered this action after action execution is finished.
@@ -76,24 +76,25 @@ class ReplyContext {
         this.storage = storage;
         this.scheduler = scheduler;
     }
+    getQuotePart(quote) {
+        return typeof quote == 'boolean'
+            ? this.matchResults.length != 0
+                ? this.matchResults[0][1]
+                : this.messageText
+            : quote;
+    }
     replyWithText(text, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new textMessage_1.TextMessage(text, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
     }
     replyWithImage(name, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(`./content/${name}.png`) }, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
     }
     replyWithVideo(name, quote, options) {
-        const quotedPart = this.matchResults.length != 0
-            ? this.matchResults[0][1]
-            : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
         const response = new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(`./content/${name}.mp4`) }, this.chatInfo, this.traceId, this.action, new replyInfo_1.ReplyInfo(this.messageId, quote ? quotedPart : undefined), options);
         this.responses.push(response);
     }

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;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,CAKd;gBAGE,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"}
+{"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,CAKd;gBAGE,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;IA2C5B,OAAO,CAAC,6BAA6B;IA6BrC,OAAO,CAAC,wBAAwB;CA8BnC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -62,7 +62,11 @@ class CommandActionProcessor {
     }
     async processMessage(msg) {
         const ctx = new messageContext_1.MessageContext(this.storage, this.scheduler);
-        for (const commandAction of this.commands[msg.type]) {
+        const commandsToCheck = new Set(this.commands[msg.type]);
+        if (msg.type != messageTypes_1.MessageType.Text && msg.text != '') {
+            this.commands[messageTypes_1.MessageType.Text].map((x) => commandsToCheck.add(x));
+        }
+        for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
             try {
                 const responses = await commandAction.exec(ctx);

package/dtos/incomingMessage.ts

@@ -52,7 +52,12 @@ export class IncomingMessage {
                 ? ctxMessage.reply_to_message?.message_id
                 : undefined;
         this.from = ctxMessage.from;
-        this.text = 'text' in ctxMessage ? ctxMessage.text : '';
+        this.text =
+            'text' in ctxMessage
+                ? ctxMessage.text
+                : 'caption' in ctxMessage
+                ? ctxMessage.caption ?? ''
+                : '';
         this.chatInfo = new ChatInfo(
             ctxMessage.chat.id,
             'title' in ctxMessage.chat

package/entities/context/messageContext.ts

@@ -45,15 +45,20 @@ export class MessageContext<
         super(storage, scheduler);
     }
 
+    private getQuotePart(quote: boolean | string) {
+        return typeof quote == 'boolean'
+            ? this.matchResults.length != 0
+                ? this.matchResults[0][1]
+                : this.messageText
+            : quote;
+    }
+
     private replyWithText(
         text: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: TextMessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new TextMessage(
             text,
@@ -71,13 +76,10 @@ export class MessageContext<
 
     private replyWithImage(
         name: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: MessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new ImageMessage(
             { source: resolve(`./content/${name}.png`) },
@@ -95,13 +97,10 @@ export class MessageContext<
 
     private replyWithVideo(
         name: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: MessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new VideoMessage(
             { source: resolve(`./content/${name}.mp4`) },
@@ -132,16 +131,22 @@ export class MessageContext<
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, options?: TextMessageSendingOptions) =>
-                this.replyWithText(text, true, options),
+            withText: (
+                text: string,
+                quote?: string,
+                options?: TextMessageSendingOptions
+            ) => this.replyWithText(text, quote ?? true, options),
             /**
              * 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) =>
-                this.replyWithImage(name, true, options),
+            withImage: (
+                name: string,
+                quote?: string,
+                options?: MessageSendingOptions
+            ) => this.replyWithImage(name, quote ?? true, options),
 
             /**
              * Reply with video/gif message to message that triggered this action after action execution is finished.
@@ -149,8 +154,11 @@ export class MessageContext<
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withVideo: (name: string, options?: MessageSendingOptions) =>
-                this.replyWithVideo(name, true, options)
+            withVideo: (
+                name: string,
+                quote?: string,
+                options?: MessageSendingOptions
+            ) => this.replyWithVideo(name, quote ?? true, options)
         },
 
         /**

package/entities/context/replyContext.ts

@@ -65,15 +65,20 @@ export class ReplyContext<TParentActionState extends IActionState> {
         this.scheduler = scheduler;
     }
 
+    private getQuotePart(quote: boolean | string) {
+        return typeof quote == 'boolean'
+            ? this.matchResults.length != 0
+                ? this.matchResults[0][1]
+                : this.messageText
+            : quote;
+    }
+
     private replyWithText(
         text: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: TextMessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new TextMessage(
             text,
@@ -89,13 +94,10 @@ export class ReplyContext<TParentActionState extends IActionState> {
 
     private replyWithImage(
         name: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: MessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new ImageMessage(
             { source: resolve(`./content/${name}.png`) },
@@ -111,13 +113,10 @@ export class ReplyContext<TParentActionState extends IActionState> {
 
     private replyWithVideo(
         name: string,
-        quote: boolean,
+        quote: boolean | string,
         options?: MessageSendingOptions
     ) {
-        const quotedPart =
-            this.matchResults.length != 0
-                ? this.matchResults[0][1]
-                : this.messageText;
+        const quotedPart = this.getQuotePart(quote);
 
         const response = new VideoMessage(
             { source: resolve(`./content/${name}.mp4`) },
@@ -153,16 +152,22 @@ export class ReplyContext<TParentActionState extends IActionState> {
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, options?: TextMessageSendingOptions) =>
-                this.replyWithText(text, true, options),
+            withText: (
+                text: string,
+                quote?: string,
+                options?: TextMessageSendingOptions
+            ) => this.replyWithText(text, quote ?? true, options),
             /**
              * 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) =>
-                this.replyWithImage(name, true, options),
+            withImage: (
+                name: string,
+                quote?: string,
+                options?: MessageSendingOptions
+            ) => this.replyWithImage(name, quote ?? true, options),
 
             /**
              * Reply with video/gif message to message that triggered this action after action execution is finished.
@@ -170,8 +175,11 @@ export class ReplyContext<TParentActionState extends IActionState> {
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withVideo: (name: string, options?: MessageSendingOptions) =>
-                this.replyWithVideo(name, true, options)
+            withVideo: (
+                name: string,
+                quote?: string,
+                options?: MessageSendingOptions
+            ) => this.replyWithVideo(name, quote ?? true, options)
         },
 
         /**

package/package.json

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

package/services/actionProcessors/commandActionProcessor.ts

@@ -153,7 +153,12 @@ export class CommandActionProcessor {
             this.scheduler
         );
 
-        for (const commandAction of this.commands[msg.type]) {
+        const commandsToCheck = new Set(this.commands[msg.type]);
+        if (msg.type != MessageType.Text && msg.text != '') {
+            this.commands[MessageType.Text].map((x) => commandsToCheck.add(x));
+        }
+
+        for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
 
             try {