chz-telegram-bot 0.3.13 → 0.3.15

package/README.md

@@ -26,13 +26,13 @@ botFramework is a TypeScript library that provides a structured approach to buil
 
 ```bash
 # Using npm
-npm install chz-bot-framework
+npm install chz-telegram-bot
 
 # Using yarn
-yarn add chz-bot-framework
+yarn add chz-telegram-bot
 
 # Using bun
-bun add chz-bot-framework
+bun add chz-telegram-bot
 ```
 
 ## Quick Start
@@ -59,6 +59,7 @@ import {
     startBot,
     stopBots,
     CommandActionBuilder,
+    MessageType,
     Seconds
 } from 'chz-telegram-bot';
 
@@ -66,31 +67,52 @@ import {
 const commands = [
     new CommandActionBuilder('HelloWorld')
         .on('/hello')
-        .do(async (ctx) => {
-            ctx.replyWithText('Hello, world!');
+        .do((ctx) => {
+            ctx.reply.withText('Hello, world!');
+        })
+        .build(),
+
+    new CommandActionBuilder('Welcome')
+        .on(MessageType.NewChatMember)
+        .do((ctx) => {
+            ctx.reply, withText('Welcome to the group!');
         })
         .build()
 ];
 
-// Define scheduled actions (if needed)
-const scheduled = [];
-
 async function main() {
-    // Start the bot
-    startBot({
-        name: 'MyFirstBot',
-        tokenFilePath: './token.txt',
-        commands: commands,
-        scheduled: scheduled,
-        chats: {
-            MyChat: -1001234567890 // Replace with your actual chat ID,
-        },
-        scheduledPeriod: (60 * 5) as Seconds
-    });
-
-    // Set up graceful shutdown
-    process.on('SIGINT', () => stopBots('SIGINT'));
-    process.on('SIGTERM', () => stopBots('SIGTERM'));
+    try {
+        // Start the bot
+        const bot = await startBot({
+            name: 'MyFirstBot',
+            tokenFilePath: './token.txt',
+            commands,
+            scheduled: [], // Add scheduled actions if needed
+            chats: {
+                MyChat: -1001234567890 // Replace with your chat ID
+            },
+            scheduledPeriod: (60 * 5) as Seconds,
+            // Optional settings
+            storagePath: './data',
+            verboseLoggingForIncomingMessage: false
+        });
+
+        // Proper cleanup on shutdown
+        const cleanup = async (signal: string) => {
+            console.log(`Received ${signal}, cleaning up...`);
+            await stopBots(signal);
+            process.exit(0);
+        };
+
+        process.on('SIGINT', () => cleanup('SIGINT'));
+        process.on('SIGTERM', () => cleanup('SIGTERM'));
+
+        console.log('Bot started successfully!');
+        return bot;
+    } catch (error) {
+        console.error('Failed to start bot:', error);
+        process.exit(1);
+    }
 }
 
 main().catch(console.error);
@@ -113,21 +135,21 @@ import { CommandActionBuilder } from 'chz-telegram-bot';
 
 const myCommand = new CommandActionBuilder('StartCommand')
     .on('/start')
-    .do(async (ctx) => {
-        ctx.replyWithText('Welcome to my bot!');
+    .do((ctx) => {
+        ctx.reply.withText('Welcome to my bot!');
     })
     .build();
 ```
 
-Message types are also can trigger commands:
+Message types can also trigger commands:
 
 ```typescript
 import { CommandActionBuilder, MessageType } from 'chz-telegram-bot';
 
 const myCommand = new CommandActionBuilder('WelcomeMessage')
     .on(MessageType.NewChatMember)
-    .do(async (ctx) => {
-        ctx.replyWithText('Welcome to my group chat!');
+    .do((ctx) => {
+        ctx.reply.withText('Welcome to my group chat!');
     })
     .build();
 ```
@@ -141,38 +163,38 @@ import { ScheduledActionBuilder, Hours } from 'chz-telegram-bot';
 
 const dailyNotification = new ScheduledActionBuilder('GM')
     .runAt(9 as Hours) // Run at 9 AM
-    .do(async (ctx) => {
-        ctx.sendTextToChat('Good morning!');
+    .do((ctx) => {
+        ctx.send.text('Good morning!');
     })
     .build();
 ```
 
 ### Replies and message sending
 
-Depending on a type of action, you will have access to following interaction options:
+Depending on the type of action, you will have access to the following interaction options:
 
-| Method            | Action type | Description                                                  |
-| ----------------- | ----------- | ------------------------------------------------------------ |
-| `sendTextToChat`  | Both        | Send text to chat as a standalone message                    |
-| `sendImageToChat` | Both        | Send image to chat as a standalone message                   |
-| `sendVideoToChat` | Both        | Send video/gif to chat as a standalone message               |
-| `unpinMessage`    | Both        | Unpins message by its ID                                     |
-| `wait`            | Both        | Delays next replies from this action by given amount of ms   |
-| `replyWithText`   | Command     | Replies with text to a message that triggered an action      |
-| `replyWithImage`  | Command     | Replies with image to a message that triggered an action     |
-| `replyWithVideo`  | Command     | Replies with video/gif to a message that triggered an action |
-| `react`           | Command     | Sets an emoji reaction to a message that triggered an action |
+| Method               | Action type | Description                                                  |
+| -------------------- | ----------- | ------------------------------------------------------------ |
+| `send.text`          | Both        | Send text to chat as a standalone message                    |
+| `send.image`         | Both        | Send image to chat as a standalone message                   |
+| `send.video`         | Both        | Send video/gif to chat as a standalone message               |
+| `unpinMessage`       | Both        | Unpins message by its ID                                     |
+| `wait`               | Both        | Delays next replies from this action by given amount of ms   |
+| `reply.withText`     | Command     | Replies with text to a message that triggered an action      |
+| `reply.withImage`    | Command     | Replies with image to a message that triggered an action     |
+| `reply.withVideo`    | Command     | Replies with video/gif to a message that triggered an action |
+| `reply.withReaction` | Command     | Sets an emoji reaction to a message that triggered an action |
 
-Keep in mind that reply sending is deferred until action execution finished and will be done in order of calling in action handler.
-Ex:
+Keep in mind that reply sending is deferred until action execution finishes and will be done in order of calling in the action handler.
+Example:
 
 ```typescript
-ctx.sendTextToChat('Message 1');
+ctx.send.text('Message 1');
 ctx.wait(5000 as Millisecond);
-ctx.sendTextToChat('Message 2');
+ctx.send.text('Message 2');
 ```
 
-This will result in `Message 1` text being send, followed by `Message 2` after 5 second delay.
+This will result in `Message 1` being sent, followed by `Message 2` after a 5 second delay.
 
 ## Configuration Options
 
@@ -182,27 +204,19 @@ When starting a bot, you can provide the following configuration:
 | ----------------- | ------------------------ | --------------------------- | ----------------------------------------------------------------------------------------- |
 | `name`            | `string`                 | Yes                         | Bot name used in logging                                                                  |
 | `tokenFilePath`   | `string`                 | Yes                         | Path to file containing Telegram Bot token                                                |
-| `actions`         |                          | Yes                         | Object containing actions to be executed by bot                                           |
+| `commands`        | `CommandAction[]  `      | Yes (can be empty)          | Collection of command actions                                                             |
+| `scheduled`       | `ScheduledAction[]`      | Yes (can be empty)          | Collection of scheduled actions                                                           |
 | `chats`           | `Record<string, number>` | Yes                         | Object containing chat name-id pairs. Used for logging and execution of scheduled action. |
 | `storagePath`     | `string`                 | No                          | Custom storage path for default JsonFileStorage client                                    |
 | `scheduledPeriod` | `Seconds`                | No (will default to 1 hour) | Period between scheduled action executions                                                |
 | `services`        |                          | No                          | Custom services to be used instead of default ones                                        |
 
-Actions object should have following structure:
-
-| Option          | Type                  | Required           | Description                        |
-| --------------- | --------------------- | ------------------ | ---------------------------------- |
-| `commands`      | `CommandAction[]  `   | Yes (can be empty) | Collection of command actions      |
-| `scheduled`     | `ScheduledAction[]`   | Yes (can be empty) | Collection of scheduled actions    |
-| `inlineQueries` | `InlineQueryAction[]` | Yes (can be empty) | Collection of inline query actions |
-
 Services object should have following structure:
-
-| Option          | Type             | Required                                    | Description                        |
-| --------------- | ---------------- | ------------------------------------------- | ---------------------------------- |
-| `storageClient` | `IStorageClient` | No (will default to `JsonFileStorage`)      | Persistance state provide          |
-| `logger`        | `ILogger`        | No (will default to `JsonLogger`)           | Logger service                     |
-| `scheduler`     | `IScheduler`     | No (will default to `NodeTimeoutScheduler`) | Scheduler used to scheduled action |
+| Option | Type | Required | Description |
+|------------------|--------------------------|----------|---------------------------------------------------------------|
+| `storageClient` | `IStorageClient` | No (will default to `JsonFileStorage`) | Persistance state provide |
+| `logger` | `ILogger` | No (will default to `JsonLogger`) | Logger service |
+| `scheduler` | `IScheduler` | No (will default to `NodeTimeoutScheduler`) | Scheduler used to scheduled action|
 
 ## Advanced Usage
 
@@ -224,7 +238,7 @@ const counterCommand = new CommandActionBuilderWithState<MyCustomState>(
     .on('/count')
     .do(async (ctx, state) => {
         state.counter++;
-        ctx.replyWithText(`Count: ${state.counter}`);
+        ctx.reply.withText(`Count: ${state.counter}`);
     })
     .build();
 ```
@@ -239,15 +253,20 @@ The framework provides support for handling inline queries with type-safe builde
 import { InlineQueryActionBuilder } from 'chz-telegram-bot';
 
 const searchCommand = new InlineQueryActionBuilder('Search')
-    .do(async (ctx) => {
+    .do((ctx) => {
         const query = ctx.queryText;
         // Process the query and return inline results
-        ctx.showInlineQueryResult({
-            id: '1',
-            type: 'article',
-            title: `Search results for: ${query}`,
-            description: 'Click to send'
-        });
+        ctx.showInlineQueryResult([
+            {
+                id: '1',
+                type: 'article',
+                title: `Search results for: ${query}`,
+                description: 'Click to send',
+                input_message_content: {
+                    message_text: `Search result for: ${query}`
+                }
+            }
+        ]);
     })
     .build();
 ```
@@ -257,9 +276,9 @@ const searchCommand = new InlineQueryActionBuilder('Search')
 The framework includes a response processing queue that ensures reliable message delivery and proper ordering of responses:
 
 ```typescript
-ctx.sendTextToChat('First message');
-ctx.sendImageToChat('image.jpg');
-ctx.react('👍');
+await ctx.send.text('First message');
+await ctx.send.image('image');
+await ctx.reply.withReaction('👍');
 ```
 
 All responses are queued and processed in order, ensuring proper sequencing of messages and reactions.

package/dist/dtos/chatInfo.d.ts

@@ -1,8 +1,17 @@
+import { IncomingMessage } from './incomingMessage';
 export declare class ChatInfo {
     /** Id of a chat that action is executed in. */
     readonly id: number;
     /** Name of a chat that action is executed in. */
     readonly name: string;
-    constructor(chatId: number, chatName: string);
+    /** Last 100 messages in chat where action is executed */
+    readonly messageHistory: IncomingMessage[];
+    constructor(
+    /** Id of a chat that action is executed in. */
+    id: number, 
+    /** Name of a chat that action is executed in. */
+    name: string, 
+    /** Last 100 messages in chat where action is executed */
+    messageHistory: IncomingMessage[]);
 }
 //# sourceMappingURL=chatInfo.d.ts.map

package/dist/dtos/chatInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatInfo.d.ts","sourceRoot":"","sources":["../../dtos/chatInfo.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACjB,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAI/C"}
+{"version":3,"file":"chatInfo.d.ts","sourceRoot":"","sources":["../../dtos/chatInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,QAAQ;IAEb,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,iDAAiD;IACjD,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,yDAAyD;IACzD,QAAQ,CAAC,cAAc,EAAE,eAAe,EAAE;;IAL1C,+CAA+C;IACtC,EAAE,EAAE,MAAM;IACnB,iDAAiD;IACxC,IAAI,EAAE,MAAM;IACrB,yDAAyD;IAChD,cAAc,EAAE,eAAe,EAAE;CAEjD"}

package/dist/dtos/chatInfo.js

@@ -2,13 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatInfo = void 0;
 class ChatInfo {
-    /** Id of a chat that action is executed in. */
     id;
-    /** Name of a chat that action is executed in. */
     name;
-    constructor(chatId, chatName) {
-        this.id = chatId;
-        this.name = chatName;
+    messageHistory;
+    constructor(
+    /** Id of a chat that action is executed in. */
+    id, 
+    /** Name of a chat that action is executed in. */
+    name, 
+    /** Last 100 messages in chat where action is executed */
+    messageHistory) {
+        this.id = id;
+        this.name = name;
+        this.messageHistory = messageHistory;
     }
 }
 exports.ChatInfo = ChatInfo;

package/dist/dtos/commandTriggerCheckResult.d.ts

@@ -8,14 +8,14 @@ declare const _SkipTriggerReasonsObject: {
 };
 export type SkipTriggerReasons = keyof typeof _SkipTriggerReasonsObject;
 export declare class CommandTriggerCheckResult {
-    static DontTriggerAndSkipCooldown(reason: SkipTriggerReasons): CommandTriggerCheckResult;
-    static DoNotTrigger(reason: SkipTriggerReasons): CommandTriggerCheckResult;
-    static Trigger(): CommandTriggerCheckResult;
     readonly shouldExecute: boolean;
     readonly matchResults: RegExpExecArray[];
     readonly skipCooldown: boolean;
-    readonly reason: SkipTriggerReasons | undefined;
-    constructor(shouldExecute: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean, reason?: SkipTriggerReasons);
+    readonly reason?: SkipTriggerReasons | undefined;
+    static DontTriggerAndSkipCooldown(reason: SkipTriggerReasons): CommandTriggerCheckResult;
+    static DoNotTrigger(reason: SkipTriggerReasons): CommandTriggerCheckResult;
+    static Trigger(): CommandTriggerCheckResult;
+    constructor(shouldExecute: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean, reason?: SkipTriggerReasons | undefined);
     mergeWith(other: CommandTriggerCheckResult): CommandTriggerCheckResult;
 }
 export {};

package/dist/dtos/commandTriggerCheckResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,yBAAyB;;;;;;;CAOrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,yBAAyB,CAAC;AAExE,qBAAa,yBAAyB;IAClC,MAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,kBAAkB;IAG5D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB;IAG9C,MAAM,CAAC,OAAO;IAId,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,GAAG,SAAS,CAAC;gBAG5C,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,MAAM,CAAC,EAAE,kBAAkB;IAQ/B,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAQ7C"}
+{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,yBAAyB;;;;;;;CAOrB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,yBAAyB,CAAC;AAExE,qBAAa,yBAAyB;IAY9B,QAAQ,CAAC,aAAa,EAAE,OAAO;IAC/B,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,EAAE,OAAO;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB;IAdxC,MAAM,CAAC,0BAA0B,CAAC,MAAM,EAAE,kBAAkB;IAG5D,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,kBAAkB;IAG9C,MAAM,CAAC,OAAO;gBAKD,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,MAAM,CAAC,EAAE,kBAAkB,YAAA;IAGxC,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAQ7C"}

package/dist/dtos/commandTriggerCheckResult.js

@@ -10,6 +10,10 @@ const _SkipTriggerReasonsObject = {
     Other: 'Other'
 };
 class CommandTriggerCheckResult {
+    shouldExecute;
+    matchResults;
+    skipCooldown;
+    reason;
     static DontTriggerAndSkipCooldown(reason) {
         return new CommandTriggerCheckResult(false, [], true, reason);
     }
@@ -19,10 +23,6 @@ class CommandTriggerCheckResult {
     static Trigger() {
         return new CommandTriggerCheckResult(true, [], false);
     }
-    shouldExecute;
-    matchResults;
-    skipCooldown;
-    reason;
     constructor(shouldExecute, matchResults, skipCooldown, reason) {
         this.shouldExecute = shouldExecute;
         this.matchResults = matchResults;

package/dist/dtos/cooldownInfo.d.ts

@@ -1,7 +1,13 @@
 import { Seconds } from '../types/timeValues';
 export declare class CooldownInfo {
-    seconds: Seconds;
-    message: string | undefined;
-    constructor(seconds: Seconds, message: string | undefined);
+    /** New one-time cooldown in seconds */
+    readonly seconds: Seconds;
+    /** Cooldown message to be shown */
+    readonly message: string | undefined;
+    constructor(
+    /** New one-time cooldown in seconds */
+    seconds: Seconds, 
+    /** Cooldown message to be shown */
+    message: string | undefined);
 }
 //# sourceMappingURL=cooldownInfo.d.ts.map

package/dist/dtos/cooldownInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cooldownInfo.d.ts","sourceRoot":"","sources":["../../dtos/cooldownInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,YAAY;IACF,OAAO,EAAE,OAAO;IAAS,OAAO,EAAE,MAAM,GAAG,SAAS;gBAApD,OAAO,EAAE,OAAO,EAAS,OAAO,EAAE,MAAM,GAAG,SAAS;CAC1E"}
+{"version":3,"file":"cooldownInfo.d.ts","sourceRoot":"","sources":["../../dtos/cooldownInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,YAAY;IAEjB,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,mCAAmC;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;;IAHpC,uCAAuC;IAC9B,OAAO,EAAE,OAAO;IACzB,mCAAmC;IAC1B,OAAO,EAAE,MAAM,GAAG,SAAS;CAE3C"}

package/dist/dtos/cooldownInfo.js

@@ -4,7 +4,11 @@ exports.CooldownInfo = void 0;
 class CooldownInfo {
     seconds;
     message;
-    constructor(seconds, message) {
+    constructor(
+    /** New one-time cooldown in seconds */
+    seconds, 
+    /** Cooldown message to be shown */
+    message) {
         this.seconds = seconds;
         this.message = message;
     }

package/dist/dtos/incomingMessage.d.ts

@@ -12,6 +12,6 @@ export declare class IncomingMessage {
     readonly replyToMessageId: number | undefined;
     readonly updateObject: TelegrafContextMessage;
     private detectMessageType;
-    constructor(ctxMessage: TelegrafContextMessage, botName: string);
+    constructor(ctxMessage: TelegrafContextMessage, botName: string, history: IncomingMessage[]);
 }
 //# sourceMappingURL=incomingMessage.d.ts.map

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;CA2BlE"}
+{"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;gBAqBrB,UAAU,EAAE,sBAAsB,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE;CA6BjC"}

package/dist/dtos/incomingMessage.js

@@ -43,7 +43,7 @@ class IncomingMessage {
             return messageTypes_1.MessageType.Location;
         return messageTypes_1.MessageType.Unknown;
     }
-    constructor(ctxMessage, botName) {
+    constructor(ctxMessage, botName, history) {
         this.traceId = (0, traceFactory_1.createTrace)(this, botName, (0, crypto_1.randomInt)(10000, 99999).toString());
         this.messageId = ctxMessage.message_id;
         this.replyToMessageId =
@@ -59,7 +59,7 @@ class IncomingMessage {
                     : '';
         this.chatInfo = new chatInfo_1.ChatInfo(ctxMessage.chat.id, 'title' in ctxMessage.chat
             ? `${ctxMessage.chat.title} ${ctxMessage.chat.id}`
-            : 'DM');
+            : 'DM', history);
         this.type = this.detectMessageType(ctxMessage);
         this.updateObject = ctxMessage;
     }

package/dist/dtos/incomingQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incomingQuery.d.ts","sourceRoot":"","sources":["../../dtos/incomingQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,mBAAmB;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAGtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO;CAQvB"}
+{"version":3,"file":"incomingQuery.d.ts","sourceRoot":"","sources":["../../dtos/incomingQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,mBAAmB;IAIxB,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO;IAN7B,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAG7B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO;CAIhC"}

package/dist/dtos/messageInfo.d.ts

@@ -0,0 +1,21 @@
+import { MessageTypeValue, TelegrafContextMessage } from '../types/messageTypes';
+export declare class MessageInfo {
+    /** Id of a message that triggered this action. */
+    readonly id: number;
+    /** Text of a message that triggered this action. */
+    readonly text: string;
+    /** Type of message being received */
+    readonly type: MessageTypeValue;
+    /** Message object recieved from Telegram */
+    readonly telegramUpdateObject: TelegrafContextMessage;
+    constructor(
+    /** Id of a message that triggered this action. */
+    id: number, 
+    /** Text of a message that triggered this action. */
+    text: string, 
+    /** Type of message being received */
+    type: MessageTypeValue, 
+    /** Message object recieved from Telegram */
+    telegramUpdateObject: TelegrafContextMessage);
+}
+//# sourceMappingURL=messageInfo.d.ts.map

package/dist/dtos/messageInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageInfo.d.ts","sourceRoot":"","sources":["../../dtos/messageInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,WAAW;IAEhB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,oDAAoD;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB;IAC/B,4CAA4C;IAC5C,QAAQ,CAAC,oBAAoB,EAAE,sBAAsB;;IAPrD,kDAAkD;IACzC,EAAE,EAAE,MAAM;IACnB,oDAAoD;IAC3C,IAAI,EAAE,MAAM;IACrB,qCAAqC;IAC5B,IAAI,EAAE,gBAAgB;IAC/B,4CAA4C;IACnC,oBAAoB,EAAE,sBAAsB;CAE5D"}

package/dist/dtos/messageInfo.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageInfo = void 0;
+class MessageInfo {
+    id;
+    text;
+    type;
+    telegramUpdateObject;
+    constructor(
+    /** Id of a message that triggered this action. */
+    id, 
+    /** Text of a message that triggered this action. */
+    text, 
+    /** Type of message being received */
+    type, 
+    /** Message object recieved from Telegram */
+    telegramUpdateObject) {
+        this.id = id;
+        this.text = text;
+        this.type = type;
+        this.telegramUpdateObject = telegramUpdateObject;
+    }
+}
+exports.MessageInfo = MessageInfo;

package/dist/dtos/userInfo.d.ts

@@ -0,0 +1,12 @@
+export declare class UserInfo {
+    /** Id of a user that sent a message that triggered this action. */
+    readonly id: number;
+    /** Name of a user that sent a message that triggered this action. */
+    readonly name: string;
+    constructor(
+    /** Id of a user that sent a message that triggered this action. */
+    id: number, 
+    /** Name of a user that sent a message that triggered this action. */
+    name: string);
+}
+//# sourceMappingURL=userInfo.d.ts.map

package/dist/dtos/userInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"userInfo.d.ts","sourceRoot":"","sources":["../../dtos/userInfo.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IAEb,mEAAmE;IACnE,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM;;IAHrB,mEAAmE;IAC1D,EAAE,EAAE,MAAM;IACnB,qEAAqE;IAC5D,IAAI,EAAE,MAAM;CAE5B"}

package/dist/dtos/userInfo.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserInfo = void 0;
+class UserInfo {
+    id;
+    name;
+    constructor(
+    /** Id of a user that sent a message that triggered this action. */
+    id, 
+    /** Name of a user that sent a message that triggered this action. */
+    name) {
+        this.id = id;
+        this.name = name;
+    }
+}
+exports.UserInfo = UserInfo;

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

@@ -2,7 +2,7 @@ import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
 import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/action';
-import { MessageContext } from '../context/messageContext';
+import { MessageContextInternal } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Sema as Semaphore } from 'async-sema';
 import { CooldownInfo } from '../../dtos/cooldownInfo';
@@ -23,7 +23,7 @@ export declare class CommandAction<TActionState extends IActionState> implements
     readonly maxAllowedSimultaniousExecutions: number;
     lastCustomCooldown: Seconds | undefined;
     constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldownInfo: CooldownInfo, chatsBlacklist: number[], allowedUsers: number[], maxAllowedSimultaniousExecutions: number, condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
-    exec(ctx: MessageContext<TActionState>): Promise<import("../../types/response").BotResponse[]>;
+    exec(ctx: MessageContextInternal<TActionState>): Promise<import("../../types/response").BotResponse[]>;
     private checkIfShouldBeExecuted;
     private checkTrigger;
 }

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;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,mBAAmB,yBAAgC;IAE5D,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAElD,kBAAkB,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGpC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,gCAAgC,EAAE,MAAM,EACxC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAkBxC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IA8E5C,OAAO,CAAC,uBAAuB;IAsC/B,OAAO,CAAC,YAAY;CAuCvB"}
+{"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;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,mBAAmB,yBAAgC;IAE5D,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAElD,kBAAkB,EAAE,OAAO,GAAG,SAAS,CAAC;gBAGpC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,gCAAgC,EAAE,MAAM,EACxC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAkBxC,IAAI,CAAC,GAAG,EAAE,sBAAsB,CAAC,YAAY,CAAC;IA8EpD,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,YAAY;CAuCvB"}

package/dist/entities/actions/commandAction.js

@@ -62,7 +62,7 @@ class CommandAction {
             if (!shouldExecute) {
                 if (reason == 'OnCooldown' && this.cooldownInfo.message)
                     return [
-                        new textMessage_1.TextMessage(this.cooldownInfo.message, ctx.chatInfo, ctx.traceId, this, new replyInfo_1.ReplyInfo(ctx.messageId))
+                        new textMessage_1.TextMessage(this.cooldownInfo.message, ctx.chatInfo, ctx.traceId, this, new replyInfo_1.ReplyInfo(ctx.messageInfo.id))
                     ];
                 return noop_1.Noop.NoResponse;
             }
@@ -84,10 +84,13 @@ class CommandAction {
         }
     }
     checkIfShouldBeExecuted(ctx, trigger, state) {
-        if (!ctx.fromUserId)
+        const triggerCheckResult = this.checkTrigger(ctx, trigger);
+        if (!triggerCheckResult.shouldExecute)
+            return triggerCheckResult;
+        if (!ctx.userInfo.id)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserIdMissing');
         const isUserAllowed = this.allowedUsers.length == 0 ||
-            this.allowedUsers.includes(ctx.fromUserId);
+            this.allowedUsers.includes(ctx.userInfo.id);
         if (!isUserAllowed)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserForbidden');
         const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
@@ -98,24 +101,24 @@ class CommandAction {
         const isCustomConditionMet = this.condition(ctx, state);
         if (!isCustomConditionMet)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('CustomConditionNotMet');
-        return this.checkTrigger(ctx, trigger);
+        return triggerCheckResult;
     }
     checkTrigger(ctx, trigger) {
-        if (trigger == messageTypes_1.MessageType.Any || trigger == ctx.messageType)
+        if (trigger == messageTypes_1.MessageType.Any || trigger == ctx.messageInfo.type)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
         if (typeof trigger == 'string')
-            return ctx.messageText.toLowerCase() == trigger.toLowerCase()
+            return ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase()
                 ? commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger()
                 : commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
         const matchResults = [];
         trigger.lastIndex = 0;
-        const execResult = trigger.exec(ctx.messageText);
+        const execResult = trigger.exec(ctx.messageInfo.text);
         if (execResult != null) {
             let regexMatchLimit = 100;
             matchResults.push(execResult);
             if (trigger.global) {
                 while (regexMatchLimit > 0) {
-                    const nextResult = trigger.exec(ctx.messageText);
+                    const nextResult = trigger.exec(ctx.messageInfo.text);
                     if (nextResult == null)
                         break;
                     matchResults.push(nextResult);

package/dist/entities/actions/inlineQueryAction.d.ts

@@ -1,5 +1,5 @@
 import { ActionKey, IAction } from '../../types/action';
-import { InlineQueryContext } from '../context/inlineQueryContext';
+import { InlineQueryContextInternal } from '../context/inlineQueryContext';
 import { InlineQueryHandler } from '../../types/handlers';
 export declare class InlineQueryAction implements IAction {
     readonly key: ActionKey;
@@ -8,6 +8,6 @@ export declare class InlineQueryAction implements IAction {
     readonly name: string;
     readonly pattern: RegExp;
     constructor(handler: InlineQueryHandler, name: string, active: boolean, pattern: RegExp);
-    exec(ctx: InlineQueryContext): Promise<import("../../types/response").BotResponse[]>;
+    exec(ctx: InlineQueryContextInternal): Promise<import("../../types/response").BotResponse[]>;
 }
 //# sourceMappingURL=inlineQueryAction.d.ts.map