chz-telegram-bot 0.0.36 → 0.0.38

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

@@ -1 +1 @@
-{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAkB,MAAM,4BAA4B,CAAC;AAE5E,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAwDvB"}
+{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAwDvB"}

package/dist/entities/actions/commandAction.js

@@ -10,7 +10,6 @@ const toArray_1 = require("../../helpers/toArray");
 const commandTriggerCheckResult_1 = require("../commandTriggerCheckResult");
 const logger_1 = require("../../services/logger");
 const actionExecutionResult_1 = require("../actionExecutionResult");
-const commandTrigger_1 = require("../../types/commandTrigger");
 class CommandAction {
     constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, condition, stateConstructor) {
         this.triggers = (0, toArray_1.toArray)(trigger);
@@ -62,8 +61,8 @@ class CommandAction {
         const onCooldown = (0, moment_1.default)().diff(lastExecutedDate) < cooldownInMilliseconds;
         if (onCooldown)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
-        if (trigger == commandTrigger_1.NonTextMessage.Any) {
-            shouldTrigger = ctx.messageText == '';
+        if (trigger == ctx.messageType) {
+            shouldTrigger = true;
         }
         else if (typeof trigger == 'string') {
             shouldTrigger = ctx.messageText.toLowerCase() == trigger;

package/dist/entities/botInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC7B;IAmCD,OAAO,CAAC,6BAA6B;IA4CrC,OAAO,CAAC,2BAA2B;IAoB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC7B;IAmCD,OAAO,CAAC,6BAA6B;IA2CrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}

package/dist/entities/botInstance.js

@@ -54,8 +54,9 @@ class BotInstance {
     initializeMessageProcessing() {
         if (this.commands.length > 0) {
             this.telegraf.on('message', async (ctx) => {
+                console.dir(ctx.update);
                 const msg = new incomingMessage_1.IncomingMessage(ctx.update.message);
-                const messageContent = msg.text || '<non-text message>';
+                const messageContent = msg.text || `<non-text message: ${msg.type}>`;
                 const messageFromName = msg.from?.first_name ?? 'Unknown';
                 const messageFromId = msg.from?.id ?? 'Unknown';
                 logger_1.Logger.logWithTraceId(this.name, msg.traceId, msg.chatName, `${messageFromName} (${messageFromId}): ${messageContent}`);

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

@@ -6,6 +6,7 @@ import { ChatContext } from './chatContext';
 import { IncomingMessage } from '../incomingMessage';
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/actionWithState';
+import { MessageType } from '../../types/messageTypes';
 /**
  * Context of action executed in chat, in response to a message
  */
@@ -22,6 +23,8 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     startCooldown: boolean;
     /** Name of a user that sent a message that triggered this action. */
     fromUserName: string;
+    /** Type of message being received */
+    messageType: (typeof MessageType)[keyof typeof MessageType];
     constructor(botName: string, action: IActionWithState, interactions: IBotApiInteractions, message: IncomingMessage, storage: IStorageClient);
     /**
      * Loads state of another action. Changes to the loaded state will no affect actual state of other action.

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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,6BAA6B,CAAC;AAE1E;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,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,EAAE,MAAM,CAAC;gBAGjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc;IAoB3B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,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,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,WAAW,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;gBAGxD,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc;IAqB3B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}

package/dist/entities/context/messageContext.js

@@ -20,6 +20,7 @@ class MessageContext extends chatContext_1.ChatContext {
         this.startCooldown = true;
         this.messageId = message.message_id;
         this.messageText = message.text ?? '';
+        this.messageType = message.type;
         this.fromUserId = message.from?.id;
         this.fromUserName =
             (message.from?.first_name ?? 'Unknown user') +

package/dist/entities/incomingMessage.d.ts

@@ -1,16 +1,14 @@
-import { Chat, User } from 'telegraf/types';
+import { Chat, Message, Update, User } from 'telegraf/types';
+import { MessageType } from '../types/messageTypes';
 export declare class IncomingMessage {
     message_id: number;
     chat: Chat;
     from: User | undefined;
     text: string;
     chatName: string;
+    type: (typeof MessageType)[keyof typeof MessageType];
     traceId: number;
-    constructor(ctxMessage: {
-        message_id: number;
-        chat: Chat;
-        from?: User;
-        text?: string;
-    });
+    private detectMessageType;
+    constructor(ctxMessage: Update.New & (Update.NonChannel & Message));
 }
 //# sourceMappingURL=incomingMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../entities/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAG5C,qBAAa,eAAe;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,SAA2B;gBAEtB,UAAU,EAAE;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,IAAI,CAAC;QACX,IAAI,CAAC,EAAE,IAAI,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB;CAUJ"}
+{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../entities/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,qBAAa,eAAe;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;IACrD,OAAO,SAA2B;IAElC,OAAO,CAAC,iBAAiB;gBAgBb,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;CAWrE"}

package/dist/entities/incomingMessage.js

@@ -2,13 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncomingMessage = void 0;
 const crypto_1 = require("crypto");
+const messageTypes_1 = require("../types/messageTypes");
 class IncomingMessage {
+    detectMessageType(message) {
+        if ('sticker' in message)
+            return messageTypes_1.MessageType.Sticker;
+        if ('animation' in message)
+            return messageTypes_1.MessageType.Animation;
+        if ('document' in message)
+            return messageTypes_1.MessageType.Document;
+        if ('voice' in message)
+            return messageTypes_1.MessageType.Voice;
+        if ('audio' in message)
+            return messageTypes_1.MessageType.Audio;
+        if ('left_chat_member' in message)
+            return messageTypes_1.MessageType.LeftChatMember;
+        if ('new_chat_member' in message)
+            return messageTypes_1.MessageType.NewChatMember;
+        if ('poll' in message)
+            return messageTypes_1.MessageType.Poll;
+        if ('location' in message)
+            return messageTypes_1.MessageType.Location;
+        return messageTypes_1.MessageType.Unknown;
+    }
     constructor(ctxMessage) {
         this.traceId = (0, crypto_1.randomInt)(10000, 99999);
         this.message_id = ctxMessage.message_id;
         this.chat = ctxMessage.chat;
         this.from = ctxMessage.from;
-        this.text = ctxMessage.text || '';
+        this.text = 'text' in ctxMessage ? ctxMessage.text : '';
+        this.type = this.detectMessageType(ctxMessage);
         this.chatName =
             'title' in ctxMessage.chat
                 ? ctxMessage.chat.title + ' ' + ctxMessage.chat.id

package/dist/types/commandTrigger.d.ts

@@ -1,5 +1,2 @@
-export declare enum NonTextMessage {
-    Any = 0
-}
-export type CommandTrigger = string | RegExp | NonTextMessage.Any;
+export type CommandTrigger = string | RegExp;
 //# sourceMappingURL=commandTrigger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandTrigger.d.ts","sourceRoot":"","sources":["../../types/commandTrigger.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc;IACtB,GAAG,IAAA;CACN;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC"}
+{"version":3,"file":"commandTrigger.d.ts","sourceRoot":"","sources":["../../types/commandTrigger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC"}

package/dist/types/commandTrigger.js

@@ -1,7 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NonTextMessage = void 0;
-var NonTextMessage;
-(function (NonTextMessage) {
-    NonTextMessage[NonTextMessage["Any"] = 0] = "Any";
-})(NonTextMessage || (exports.NonTextMessage = NonTextMessage = {}));

package/dist/types/messageTypes.d.ts

@@ -0,0 +1,14 @@
+export declare const MessageType: {
+    readonly Text: "__msg:Text";
+    readonly Sticker: "__msg:Sticker";
+    readonly Animation: "__msg:Animation";
+    readonly Document: "__msg:Document";
+    readonly Voice: "__msg:Voice";
+    readonly Audio: "__msg:Audio";
+    readonly LeftChatMember: "__msg:LeftChatMember";
+    readonly NewChatMember: "__msg:NewChatMember";
+    readonly Poll: "__msg:Poll";
+    readonly Location: "__msg:Location";
+    readonly Unknown: "__msg:Unknown";
+};
+//# sourceMappingURL=messageTypes.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;CAYd,CAAC"}

package/dist/types/messageTypes.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageType = void 0;
+exports.MessageType = {
+    Text: '__msg:Text',
+    Sticker: '__msg:Sticker',
+    Animation: '__msg:Animation',
+    Document: '__msg:Document',
+    Voice: '__msg:Voice',
+    Audio: '__msg:Audio',
+    LeftChatMember: '__msg:LeftChatMember',
+    NewChatMember: '__msg:NewChatMember',
+    Poll: '__msg:Poll',
+    Location: '__msg:Location',
+    Unknown: '__msg:Unknown'
+};

package/entities/actions/commandAction.ts

@@ -10,7 +10,7 @@ import { CommandTriggerCheckResult } from '../commandTriggerCheckResult';
 import { MessageContext } from '../context/messageContext';
 import { Logger } from '../../services/logger';
 import { ActionExecutionResult } from '../actionExecutionResult';
-import { CommandTrigger, NonTextMessage } from '../../types/commandTrigger';
+import { CommandTrigger } from '../../types/commandTrigger';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState
@@ -125,8 +125,8 @@ export class CommandAction<TActionState extends IActionState>
 
         if (onCooldown) return CommandTriggerCheckResult.DoNotTrigger;
 
-        if (trigger == NonTextMessage.Any) {
-            shouldTrigger = ctx.messageText == '';
+        if (trigger == ctx.messageType) {
+            shouldTrigger = true;
         } else if (typeof trigger == 'string') {
             shouldTrigger = ctx.messageText.toLowerCase() == trigger;
         } else {

package/entities/botInstance.ts

@@ -111,13 +111,13 @@ export class BotInstance {
             );
         }
     }
-
     private initializeMessageProcessing() {
         if (this.commands.length > 0) {
             this.telegraf.on('message', async (ctx) => {
                 console.dir(ctx.update);
                 const msg = new IncomingMessage(ctx.update.message);
-                const messageContent = msg.text || '<non-text message>';
+                const messageContent =
+                    msg.text || `<non-text message: ${msg.type}>`;
 
                 const messageFromName = msg.from?.first_name ?? 'Unknown';
                 const messageFromId = msg.from?.id ?? 'Unknown';

package/entities/context/messageContext.ts

@@ -15,6 +15,7 @@ import {
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
 import { IActionWithState, ActionKey } from '../../types/actionWithState';
+import { MessageType } from '../../types/messageTypes';
 
 /**
  * Context of action executed in chat, in response to a message
@@ -34,6 +35,8 @@ export class MessageContext<
     startCooldown: boolean = true;
     /** Name of a user that sent a message that triggered this action. */
     fromUserName: string;
+    /** Type of message being received */
+    messageType: (typeof MessageType)[keyof typeof MessageType];
 
     constructor(
         botName: string,
@@ -54,6 +57,7 @@ export class MessageContext<
 
         this.messageId = message.message_id;
         this.messageText = message.text ?? '';
+        this.messageType = message.type;
         this.fromUserId = message.from?.id;
         this.fromUserName =
             (message.from?.first_name ?? 'Unknown user') +

package/entities/incomingMessage.ts

@@ -1,5 +1,6 @@
-import { Chat, User } from 'telegraf/types';
+import { Chat, Message, Update, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
+import { MessageType } from '../types/messageTypes';
 
 export class IncomingMessage {
     message_id: number;
@@ -7,18 +8,31 @@ export class IncomingMessage {
     from: User | undefined;
     text: string;
     chatName: string;
+    type: (typeof MessageType)[keyof typeof MessageType];
     traceId = randomInt(10000, 99999);
 
-    constructor(ctxMessage: {
-        message_id: number;
-        chat: Chat;
-        from?: User;
-        text?: string;
-    }) {
+    private detectMessageType(
+        message: Update.New & (Update.NonChannel & Message)
+    ) {
+        if ('sticker' in message) return MessageType.Sticker;
+        if ('animation' in message) return MessageType.Animation;
+        if ('document' in message) return MessageType.Document;
+        if ('voice' in message) return MessageType.Voice;
+        if ('audio' in message) return MessageType.Audio;
+        if ('left_chat_member' in message) return MessageType.LeftChatMember;
+        if ('new_chat_member' in message) return MessageType.NewChatMember;
+        if ('poll' in message) return MessageType.Poll;
+        if ('location' in message) return MessageType.Location;
+
+        return MessageType.Unknown;
+    }
+
+    constructor(ctxMessage: Update.New & (Update.NonChannel & Message)) {
         this.message_id = ctxMessage.message_id;
         this.chat = ctxMessage.chat;
         this.from = ctxMessage.from;
-        this.text = ctxMessage.text || '';
+        this.text = 'text' in ctxMessage ? ctxMessage.text : '';
+        this.type = this.detectMessageType(ctxMessage);
         this.chatName =
             'title' in ctxMessage.chat
                 ? ctxMessage.chat.title + ' ' + ctxMessage.chat.id

package/package.json

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

package/types/commandTrigger.ts

@@ -1,5 +1 @@
-export enum NonTextMessage {
-    Any
-}
-
-export type CommandTrigger = string | RegExp | NonTextMessage.Any;
+export type CommandTrigger = string | RegExp;

package/types/messageTypes.ts

@@ -0,0 +1,13 @@
+export const MessageType = {
+    Text: '__msg:Text',
+    Sticker: '__msg:Sticker',
+    Animation: '__msg:Animation',
+    Document: '__msg:Document',
+    Voice: '__msg:Voice',
+    Audio: '__msg:Audio',
+    LeftChatMember: '__msg:LeftChatMember',
+    NewChatMember: '__msg:NewChatMember',
+    Poll: '__msg:Poll',
+    Location: '__msg:Location',
+    Unknown: '__msg:Unknown'
+} as const;