chz-telegram-bot 0.3.12 → 0.3.14

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/commandTriggerCheckResult.d.ts

@@ -1,11 +1,22 @@
+declare const _SkipTriggerReasonsObject: {
+    readonly UserIdMissing: "UserIdMissing";
+    readonly UserForbidden: "UserForbidden";
+    readonly OnCooldown: "OnCooldown";
+    readonly CustomConditionNotMet: "CustomConditionNotMet";
+    readonly TriggerNotSatisfied: "TriggerNotSatisfied";
+    readonly Other: "Other";
+};
+export type SkipTriggerReasons = keyof typeof _SkipTriggerReasonsObject;
 export declare class CommandTriggerCheckResult {
-    static get DontTriggerAndSkipCooldown(): CommandTriggerCheckResult;
-    static get DoNotTrigger(): CommandTriggerCheckResult;
-    static get Trigger(): CommandTriggerCheckResult;
+    static DontTriggerAndSkipCooldown(reason: SkipTriggerReasons): CommandTriggerCheckResult;
+    static DoNotTrigger(reason: SkipTriggerReasons): CommandTriggerCheckResult;
+    static Trigger(): CommandTriggerCheckResult;
     readonly shouldExecute: boolean;
     readonly matchResults: RegExpExecArray[];
     readonly skipCooldown: boolean;
-    constructor(shouldExecute: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean);
+    readonly reason: SkipTriggerReasons | undefined;
+    constructor(shouldExecute: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean, reason?: SkipTriggerReasons);
     mergeWith(other: CommandTriggerCheckResult): CommandTriggerCheckResult;
 }
+export {};
 //# sourceMappingURL=commandTriggerCheckResult.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,qBAAa,yBAAyB;IAClC,MAAM,KAAK,0BAA0B,8BAEpC;IACD,MAAM,KAAK,YAAY,8BAEtB;IACD,MAAM,KAAK,OAAO,8BAEjB;IAED,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;gBAG3B,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO;IAOzB,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAO7C"}
+{"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"}

package/dist/dtos/commandTriggerCheckResult.js

@@ -1,26 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandTriggerCheckResult = void 0;
+const _SkipTriggerReasonsObject = {
+    UserIdMissing: 'UserIdMissing',
+    UserForbidden: 'UserForbidden',
+    OnCooldown: 'OnCooldown',
+    CustomConditionNotMet: 'CustomConditionNotMet',
+    TriggerNotSatisfied: 'TriggerNotSatisfied',
+    Other: 'Other'
+};
 class CommandTriggerCheckResult {
-    static get DontTriggerAndSkipCooldown() {
-        return new CommandTriggerCheckResult(false, [], true);
+    static DontTriggerAndSkipCooldown(reason) {
+        return new CommandTriggerCheckResult(false, [], true, reason);
     }
-    static get DoNotTrigger() {
-        return new CommandTriggerCheckResult(false, [], false);
+    static DoNotTrigger(reason) {
+        return new CommandTriggerCheckResult(false, [], false, reason);
     }
-    static get Trigger() {
+    static Trigger() {
         return new CommandTriggerCheckResult(true, [], false);
     }
     shouldExecute;
     matchResults;
     skipCooldown;
-    constructor(shouldExecute, matchResults, skipCooldown) {
+    reason;
+    constructor(shouldExecute, matchResults, skipCooldown, reason) {
         this.shouldExecute = shouldExecute;
         this.matchResults = matchResults;
         this.skipCooldown = skipCooldown;
+        this.reason = reason;
     }
     mergeWith(other) {
-        return new CommandTriggerCheckResult(this.shouldExecute || other.shouldExecute, this.matchResults.concat(other.matchResults), this.skipCooldown || other.skipCooldown);
+        return new CommandTriggerCheckResult(this.shouldExecute || other.shouldExecute, this.matchResults.concat(other.matchResults), this.skipCooldown || other.skipCooldown, other.reason);
     }
 }
 exports.CommandTriggerCheckResult = CommandTriggerCheckResult;

package/dist/dtos/cooldownInfo.d.ts

@@ -0,0 +1,7 @@
+import { Seconds } from '../types/timeValues';
+export declare class CooldownInfo {
+    seconds: Seconds;
+    message: string | undefined;
+    constructor(seconds: Seconds, message: string | undefined);
+}
+//# sourceMappingURL=cooldownInfo.d.ts.map

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

@@ -0,0 +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"}

package/dist/dtos/cooldownInfo.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CooldownInfo = void 0;
+class CooldownInfo {
+    seconds;
+    message;
+    constructor(seconds, message) {
+        this.seconds = seconds;
+        this.message = message;
+    }
+}
+exports.CooldownInfo = CooldownInfo;

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

@@ -1,17 +1,18 @@
 import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
-import { Seconds } from '../../types/timeValues';
 import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/action';
 import { MessageContext } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Sema as Semaphore } from 'async-sema';
+import { CooldownInfo } from '../../dtos/cooldownInfo';
+import { Seconds } from '../../types/timeValues';
 export declare class CommandAction<TActionState extends IActionState> implements IActionWithState<TActionState> {
     readonly ratelimitSemaphores: Map<number, Semaphore>;
     readonly triggers: CommandTrigger[];
     readonly handler: CommandHandler<TActionState>;
     readonly name: string;
-    readonly cooldownInSeconds: Seconds;
+    readonly cooldownInfo: CooldownInfo;
     readonly active: boolean;
     readonly chatsBlacklist: number[];
     readonly allowedUsers: number[];
@@ -20,7 +21,8 @@ export declare class CommandAction<TActionState extends IActionState> implements
     readonly key: ActionKey;
     readonly readmeFactory: (botName: string) => string;
     readonly maxAllowedSimultaniousExecutions: number;
-    constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldown: Seconds, chatsBlacklist: number[], allowedUsers: number[], maxAllowedSimultaniousExecutions: number, condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
+    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[]>;
     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;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,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;AAG/C,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,iBAAiB,EAAE,OAAO,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;gBAG9C,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,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;IA8D5C,OAAO,CAAC,uBAAuB;IA+B/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,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;IA0C/B,OAAO,CAAC,YAAY;CAuCvB"}

package/dist/entities/actions/commandAction.js

@@ -12,12 +12,14 @@ const noop_1 = require("../../helpers/noop");
 const messageTypes_1 = require("../../types/messageTypes");
 const async_sema_1 = require("async-sema");
 const mapUtils_1 = require("../../helpers/mapUtils");
+const textMessage_1 = require("../../dtos/responses/textMessage");
+const replyInfo_1 = require("../../dtos/replyInfo");
 class CommandAction {
     ratelimitSemaphores = new Map();
     triggers;
     handler;
     name;
-    cooldownInSeconds;
+    cooldownInfo;
     active;
     chatsBlacklist;
     allowedUsers;
@@ -26,11 +28,12 @@ class CommandAction {
     key;
     readmeFactory;
     maxAllowedSimultaniousExecutions;
-    constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, maxAllowedSimultaniousExecutions, condition, stateConstructor, readmeFactory) {
+    lastCustomCooldown;
+    constructor(trigger, handler, name, active, cooldownInfo, chatsBlacklist, allowedUsers, maxAllowedSimultaniousExecutions, condition, stateConstructor, readmeFactory) {
         this.triggers = (0, toArray_1.toArray)(trigger);
         this.handler = handler;
         this.name = name;
-        this.cooldownInSeconds = cooldown;
+        this.cooldownInfo = cooldownInfo;
         this.active = active;
         this.chatsBlacklist = chatsBlacklist;
         this.allowedUsers = allowedUsers;
@@ -53,11 +56,16 @@ class CommandAction {
         }
         try {
             const state = await ctx.storage.getActionState(this, ctx.chatInfo.id);
-            const { shouldExecute, matchResults, skipCooldown } = this.triggers
+            const { shouldExecute, matchResults, skipCooldown, reason } = this.triggers
                 .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
-                .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger);
-            if (!shouldExecute)
+                .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('Other'));
+            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))
+                    ];
                 return noop_1.Noop.NoResponse;
+            }
             ctx.logger.logWithTraceId(` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
             ctx.matchResults = matchResults;
             await this.handler(ctx, state);
@@ -65,6 +73,7 @@ class CommandAction {
                 ctx.startCooldown = false;
             }
             if (ctx.startCooldown) {
+                this.lastCustomCooldown = ctx.customCooldown;
                 state.lastExecutedDate = (0, moment_1.default)().valueOf();
             }
             await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, state);
@@ -75,29 +84,32 @@ class CommandAction {
         }
     }
     checkIfShouldBeExecuted(ctx, trigger, state) {
+        const triggerCheckResult = this.checkTrigger(ctx, trigger);
+        if (!triggerCheckResult.shouldExecute)
+            return triggerCheckResult;
         if (!ctx.fromUserId)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserIdMissing');
         const isUserAllowed = this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
         if (!isUserAllowed)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('UserForbidden');
         const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
-        const cooldownInMilliseconds = (0, timeConvertions_1.secondsToMilliseconds)(this.cooldownInSeconds);
+        const cooldownInMilliseconds = (0, timeConvertions_1.secondsToMilliseconds)(this.lastCustomCooldown ?? this.cooldownInfo.seconds);
         const onCooldown = (0, moment_1.default)().diff(lastExecutedDate) < cooldownInMilliseconds;
         if (onCooldown)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('OnCooldown');
         const isCustomConditionMet = this.condition(ctx, state);
         if (!isCustomConditionMet)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
-        return this.checkTrigger(ctx, trigger);
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown('CustomConditionNotMet');
+        return triggerCheckResult;
     }
     checkTrigger(ctx, trigger) {
         if (trigger == messageTypes_1.MessageType.Any || trigger == ctx.messageType)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
         if (typeof trigger == 'string')
             return ctx.messageText.toLowerCase() == trigger.toLowerCase()
-                ? commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger
-                : commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
+                ? commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger()
+                : commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
         const matchResults = [];
         trigger.lastIndex = 0;
         const execResult = trigger.exec(ctx.messageText);

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

@@ -1 +1 @@
-{"version":3,"file":"replyCaptureAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/replyCaptureAction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,qBAAa,kBAAkB,CAAC,kBAAkB,SAAS,YAAY,CACnE,YAAW,OAAO;IAElB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,CACd,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAGtC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EAClD,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,eAAe,EAAE,eAAe;IAY9B,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,kBAAkB,CAAC;IAyBhD,OAAO,CAAC,uBAAuB;CA0ClC"}
+{"version":3,"file":"replyCaptureAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/replyCaptureAction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,qBAAa,kBAAkB,CAAC,kBAAkB,SAAS,YAAY,CACnE,YAAW,OAAO;IAElB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,CACd,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;gBAGtC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EAClD,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,eAAe,EAAE,eAAe;IAY9B,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,kBAAkB,CAAC;IAyBhD,OAAO,CAAC,uBAAuB;CA+ClC"}

package/dist/entities/actions/replyCaptureAction.js

@@ -23,7 +23,7 @@ class ReplyCaptureAction {
             throw new Error(`Context for ${this.key} is not initialized or already consumed`);
         const { shouldExecute, matchResults } = this.triggers
             .map((x) => this.checkIfShouldBeExecuted(ctx, x))
-            .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger);
+            .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('Other'));
         if (!shouldExecute)
             return noop_1.Noop.NoResponse;
         ctx.logger.logWithTraceId(` - Executing [${this.key}] in ${ctx.chatInfo.id}`);
@@ -33,14 +33,14 @@ class ReplyCaptureAction {
     }
     checkIfShouldBeExecuted(ctx, trigger) {
         if (ctx.replyMessageId != this.parentMessageId)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
         if (trigger == ctx.messageType)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger;
+            return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
         if (typeof trigger == 'string')
             if (ctx.messageText.toLowerCase() == trigger.toLowerCase())
-                return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger;
+                return commandTriggerCheckResult_1.CommandTriggerCheckResult.Trigger();
             else
-                return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger;
+                return commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
         const matchResults = [];
         trigger.lastIndex = 0;
         const execResult = trigger.exec(ctx.messageText);

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

@@ -1,9 +1,10 @@
-import { TelegramEmoji } from 'telegraf/types';
+import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { IActionState } from '../../types/actionState';
 import { ChatContext } from './chatContext';
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { MessageTypeValue, TelegrafContextMessage } from '../../types/messageTypes';
 import { CommandAction } from '../actions/commandAction';
+import { Seconds } from '../../types/timeValues';
 /**
  * Context of action executed in chat, in response to a message
  */
@@ -24,10 +25,14 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     messageType: MessageTypeValue;
     /** Message object recieved from Telegram */
     messageUpdateObject: TelegrafContextMessage;
+    /** Bot info from Telegram */
+    botInfo: UserFromGetMe;
+    customCooldown: Seconds | undefined;
     private getQuotePart;
     private replyWithText;
     private replyWithImage;
     private replyWithVideo;
+    startCustomCooldown(customCooldown: Seconds): void;
     /**
      * Collection of actions that can be done as a reply to a message that triggered this 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,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,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;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IAC5D,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;IAE7C,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"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC9D,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;AAElC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IAC5D,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;IAC7C,6BAA6B;IAC7B,OAAO,EAAG,aAAa,CAAC;IAExB,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,cAAc;IAqBtB,mBAAmB,CAAC,cAAc,EAAE,OAAO;IAK3C;;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

@@ -28,6 +28,9 @@ class MessageContext extends chatContext_1.ChatContext {
     messageType;
     /** Message object recieved from Telegram */
     messageUpdateObject;
+    /** Bot info from Telegram */
+    botInfo;
+    customCooldown;
     getQuotePart(quote) {
         return typeof quote == 'boolean'
             ? this.matchResults.length != 0
@@ -53,6 +56,10 @@ class MessageContext extends chatContext_1.ChatContext {
         this.responses.push(response);
         return this.createCaptureController(response);
     }
+    startCustomCooldown(customCooldown) {
+        this.startCooldown = true;
+        this.customCooldown = customCooldown;
+    }
     /**
      * Collection of actions that can be done as a reply to a message that triggered this action
      */

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

@@ -1,4 +1,4 @@
-import { TelegramEmoji } from 'telegraf/types';
+import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { IActionState } from '../../types/actionState';
 import { TextMessageSendingOptions, MessageSendingOptions } from '../../types/messageSendingOptions';
 import { MessageTypeValue, TelegrafContextMessage } from '../../types/messageTypes';
@@ -21,6 +21,8 @@ export declare class ReplyContext<TParentActionState extends IActionState> exten
     fromUserName: string;
     /** Message object recieved from Telegram */
     messageUpdateObject: TelegrafContextMessage;
+    /** Bot info from Telegram */
+    botInfo: UserFromGetMe;
     isInitialized: boolean;
     private getQuotePart;
     private replyWithText;

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;AAM/C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,YAAY,CACrB,kBAAkB,SAAS,YAAY,CACzC,SAAQ,WAAW,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IACzD,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;IAEtB,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;YAIvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAKnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAMvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAG5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}
+{"version":3,"file":"replyContext.d.ts","sourceRoot":"","sources":["../../../entities/context/replyContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,YAAY,CACrB,kBAAkB,SAAS,YAAY,CACzC,SAAQ,WAAW,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IACzD,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;IAC7C,6BAA6B;IAC7B,OAAO,EAAG,aAAa,CAAC;IAExB,aAAa,UAAS;IAEtB,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;YAIvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAKnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAMvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAG5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}

package/dist/entities/context/replyContext.js

@@ -25,6 +25,8 @@ class ReplyContext extends baseContext_1.BaseContext {
     fromUserName;
     /** Message object recieved from Telegram */
     messageUpdateObject;
+    /** Bot info from Telegram */
+    botInfo;
     isInitialized = false;
     getQuotePart(quote) {
         return typeof quote == 'boolean'

package/dist/helpers/builders/commandActionBuilder.d.ts

@@ -20,6 +20,7 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
     handler: CommandHandler<TActionState>;
     condition: CommandCondition<TActionState>;
     maxAllowedSimultaniousExecutions: number;
+    cooldownMessage: string | undefined;
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -54,6 +55,10 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
      * @param seconds Cooldown in seconds.
      */
     cooldown(seconds: Seconds): this;
+    /** Sets action cooldown message.
+     * @param message Message that will be sent if action is on cooldown.
+     */
+    withCooldownMessage(message: string): this;
     /**
      * Adds a chat to ignore list for this action.
      * @param chatId Chat id to ignore.

package/dist/helpers/builders/commandActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,CAAM;IAEhD,MAAM,UAAQ;IACd,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,CAAQ;IAC3D,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAa;IAClD,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IACtD,gCAAgC,EAAE,MAAM,CAAK;IAE7C;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR,qHAAqH;IACrH,SAAS,CAAC,gCAAgC,EAAE,MAAM;IAOlD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAMzB;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,oBAAoB;IACpB,KAAK;CAeR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}
+{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,CAAM;IAEhD,MAAM,UAAQ;IACd,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,CAAQ;IAC3D,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAa;IAClD,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IACtD,gCAAgC,EAAE,MAAM,CAAK;IAC7C,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IAEpC;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR,qHAAqH;IACrH,SAAS,CAAC,gCAAgC,EAAE,MAAM;IAOlD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAMzB;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM;IAMnC;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,oBAAoB;IACpB,KAAK;CAeR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}

package/dist/helpers/builders/commandActionBuilder.js

@@ -5,6 +5,7 @@ const commandAction_1 = require("../../entities/actions/commandAction");
 const actionStateBase_1 = require("../../entities/states/actionStateBase");
 const toArray_1 = require("../toArray");
 const noop_1 = require("../noop");
+const cooldownInfo_1 = require("../../dtos/cooldownInfo");
 /**
  * Builder for `CommandAction` with state represented by `TActionState`
  */
@@ -20,6 +21,7 @@ class CommandActionBuilderWithState {
     handler = noop_1.Noop.call;
     condition = noop_1.Noop.true;
     maxAllowedSimultaniousExecutions = 0;
+    cooldownMessage;
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -82,6 +84,13 @@ class CommandActionBuilderWithState {
         this.cooldownSeconds = seconds;
         return this;
     }
+    /** Sets action cooldown message.
+     * @param message Message that will be sent if action is on cooldown.
+     */
+    withCooldownMessage(message) {
+        this.cooldownMessage = message;
+        return this;
+    }
     /**
      * Adds a chat to ignore list for this action.
      * @param chatId Chat id to ignore.
@@ -92,7 +101,7 @@ class CommandActionBuilderWithState {
     }
     /** Builds action */
     build() {
-        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, this.cooldownSeconds, this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory != null ? this.readmeFactory : (_) => '');
+        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, new cooldownInfo_1.CooldownInfo(this.cooldownSeconds, this.cooldownMessage), this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory != null ? this.readmeFactory : (_) => '');
     }
 }
 exports.CommandActionBuilderWithState = CommandActionBuilderWithState;

package/dist/services/actionProcessingService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actionProcessingService.d.ts","sourceRoot":"","sources":["../../services/actionProcessingService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,QAAQ,CAAY;gBAGxB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IA4Bb,UAAU,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IA0D9C,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}
+{"version":3,"file":"actionProcessingService.d.ts","sourceRoot":"","sources":["../../services/actionProcessingService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,QAAQ,CAAY;gBAGxB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IA4Bb,UAAU,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IA2D9C,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}

package/dist/services/actionProcessingService.js

@@ -38,7 +38,7 @@ class ActionProcessingService {
                 ...actions.commands
             ]
             : [];
-        this.commandProcessor.initialize(api, this.telegraf, commandActions, verboseLoggingForIncomingMessage ?? false);
+        this.commandProcessor.initialize(api, this.telegraf, commandActions, verboseLoggingForIncomingMessage ?? false, botInfo);
         this.inlineQueryProcessor.initialize(api, this.telegraf, actions.inlineQueries, 300);
         this.scheduledProcessor.initialize(api, actions.scheduled, scheduledPeriod ?? (0, timeConvertions_1.hoursToSeconds)(1));
         void this.storage.saveMetadata([

package/dist/services/actionProcessors/commandActionProcessor.d.ts

@@ -6,10 +6,12 @@ import { IReplyCapture } from '../../types/capture';
 import { TraceId } from '../../types/trace';
 import { ChatInfo } from '../../dtos/chatInfo';
 import { BaseActionProcessor } from './baseProcessor';
+import { UserFromGetMe } from 'telegraf/types';
 export declare class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures;
+    private botInfo;
     private commands;
-    initialize(api: TelegramApiService, telegraf: Telegraf, commands: CommandAction<IActionState>[], verboseLoggingForIncomingMessage: boolean): void;
+    initialize(api: TelegramApiService, telegraf: Telegraf, commands: CommandAction<IActionState>[], verboseLoggingForIncomingMessage: boolean, botInfo: UserFromGetMe): void;
     captureRegistrationCallback(capture: IReplyCapture, parentMessageId: number, chatInfo: ChatInfo, traceId: TraceId): void;
     private processMessage;
     private initializeReplyCaptureContext;

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;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,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;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IAExE,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO;IAyD7C,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YA+BN,cAAc;IAiC5B,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;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,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;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,gCAAgC,EAAE,OAAO,EACzC,OAAO,EAAE,aAAa;IA0D1B,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YA+BN,cAAc;IAiC5B,OAAO,CAAC,6BAA6B;IA8BrC,OAAO,CAAC,wBAAwB;CAgCnC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -10,11 +10,13 @@ const objectFromEntries_1 = require("../../helpers/objectFromEntries");
 const baseProcessor_1 = require("./baseProcessor");
 class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
     replyCaptures = [];
+    botInfo;
     commands = (0, objectFromEntries_1.typeSafeObjectFromEntries)(Object.values(messageTypes_1.MessageType).map((x) => [
         x,
         []
     ]));
-    initialize(api, telegraf, commands, verboseLoggingForIncomingMessage) {
+    initialize(api, telegraf, commands, verboseLoggingForIncomingMessage, botInfo) {
+        this.botInfo = botInfo;
         this.initializeDependencies(api);
         for (const msgType of Object.values(messageTypes_1.MessageType)) {
             if (msgType == messageTypes_1.MessageType.Text) {
@@ -87,6 +89,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
         ctx.traceId = message.traceId;
+        ctx.botInfo = this.botInfo;
         ctx.isInitialized = true;
         ctx.matchResults = [];
         ctx.logger = this.logger.createScope(this.botName, message.traceId, message.chatInfo.name);
@@ -108,6 +111,8 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
         ctx.traceId = message.traceId;
+        ctx.botInfo = this.botInfo;
+        ctx.customCooldown = undefined;
         ctx.logger = this.logger.createScope(this.botName, message.traceId, message.chatInfo.name);
     }
 }

package/dtos/commandTriggerCheckResult.ts

@@ -1,33 +1,48 @@
+const _SkipTriggerReasonsObject = {
+    UserIdMissing: 'UserIdMissing',
+    UserForbidden: 'UserForbidden',
+    OnCooldown: 'OnCooldown',
+    CustomConditionNotMet: 'CustomConditionNotMet',
+    TriggerNotSatisfied: 'TriggerNotSatisfied',
+    Other: 'Other'
+} as const;
+
+export type SkipTriggerReasons = keyof typeof _SkipTriggerReasonsObject;
+
 export class CommandTriggerCheckResult {
-    static get DontTriggerAndSkipCooldown() {
-        return new CommandTriggerCheckResult(false, [], true);
+    static DontTriggerAndSkipCooldown(reason: SkipTriggerReasons) {
+        return new CommandTriggerCheckResult(false, [], true, reason);
     }
-    static get DoNotTrigger() {
-        return new CommandTriggerCheckResult(false, [], false);
+    static DoNotTrigger(reason: SkipTriggerReasons) {
+        return new CommandTriggerCheckResult(false, [], false, reason);
     }
-    static get Trigger() {
+    static Trigger() {
         return new CommandTriggerCheckResult(true, [], false);
     }
 
     readonly shouldExecute: boolean;
     readonly matchResults: RegExpExecArray[];
     readonly skipCooldown: boolean;
+    readonly reason: SkipTriggerReasons | undefined;
 
     constructor(
         shouldExecute: boolean,
         matchResults: RegExpExecArray[],
-        skipCooldown: boolean
+        skipCooldown: boolean,
+        reason?: SkipTriggerReasons
     ) {
         this.shouldExecute = shouldExecute;
         this.matchResults = matchResults;
         this.skipCooldown = skipCooldown;
+        this.reason = reason;
     }
 
     mergeWith(other: CommandTriggerCheckResult) {
         return new CommandTriggerCheckResult(
             this.shouldExecute || other.shouldExecute,
             this.matchResults.concat(other.matchResults),
-            this.skipCooldown || other.skipCooldown
+            this.skipCooldown || other.skipCooldown,
+            other.reason
         );
     }
 }

package/dtos/cooldownInfo.ts

@@ -0,0 +1,5 @@
+import { Seconds } from '../types/timeValues';
+
+export class CooldownInfo {
+    constructor(public seconds: Seconds, public message: string | undefined) {}
+}

package/entities/actions/commandAction.ts

@@ -1,7 +1,6 @@
 import moment from 'moment';
 import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
-import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
 import { toArray } from '../../helpers/toArray';
 import { IActionState } from '../../types/actionState';
@@ -13,6 +12,10 @@ import { Noop } from '../../helpers/noop';
 import { MessageType } from '../../types/messageTypes';
 import { Sema as Semaphore } from 'async-sema';
 import { getOrSetIfNotExists } from '../../helpers/mapUtils';
+import { CooldownInfo } from '../../dtos/cooldownInfo';
+import { TextMessage } from '../../dtos/responses/textMessage';
+import { ReplyInfo } from '../../dtos/replyInfo';
+import { Seconds } from '../../types/timeValues';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -22,7 +25,7 @@ export class CommandAction<TActionState extends IActionState>
     readonly triggers: CommandTrigger[];
     readonly handler: CommandHandler<TActionState>;
     readonly name: string;
-    readonly cooldownInSeconds: Seconds;
+    readonly cooldownInfo: CooldownInfo;
     readonly active: boolean;
     readonly chatsBlacklist: number[];
     readonly allowedUsers: number[];
@@ -32,12 +35,14 @@ export class CommandAction<TActionState extends IActionState>
     readonly readmeFactory: (botName: string) => string;
     readonly maxAllowedSimultaniousExecutions: number;
 
+    lastCustomCooldown: Seconds | undefined;
+
     constructor(
         trigger: CommandTrigger | CommandTrigger[],
         handler: CommandHandler<TActionState>,
         name: string,
         active: boolean,
-        cooldown: Seconds,
+        cooldownInfo: CooldownInfo,
         chatsBlacklist: number[],
         allowedUsers: number[],
         maxAllowedSimultaniousExecutions: number,
@@ -48,7 +53,7 @@ export class CommandAction<TActionState extends IActionState>
         this.triggers = toArray(trigger);
         this.handler = handler;
         this.name = name;
-        this.cooldownInSeconds = cooldown;
+        this.cooldownInfo = cooldownInfo;
         this.active = active;
         this.chatsBlacklist = chatsBlacklist;
         this.allowedUsers = allowedUsers;
@@ -87,14 +92,28 @@ export class CommandAction<TActionState extends IActionState>
                 ctx.chatInfo.id
             );
 
-            const { shouldExecute, matchResults, skipCooldown } = this.triggers
-                .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
-                .reduce(
-                    (acc, curr) => acc.mergeWith(curr),
-                    CommandTriggerCheckResult.DoNotTrigger
-                );
-
-            if (!shouldExecute) return Noop.NoResponse;
+            const { shouldExecute, matchResults, skipCooldown, reason } =
+                this.triggers
+                    .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
+                    .reduce(
+                        (acc, curr) => acc.mergeWith(curr),
+                        CommandTriggerCheckResult.DoNotTrigger('Other')
+                    );
+
+            if (!shouldExecute) {
+                if (reason == 'OnCooldown' && this.cooldownInfo.message)
+                    return [
+                        new TextMessage(
+                            this.cooldownInfo.message,
+                            ctx.chatInfo,
+                            ctx.traceId,
+                            this,
+                            new ReplyInfo(ctx.messageId)
+                        )
+                    ];
+
+                return Noop.NoResponse;
+            }
 
             ctx.logger.logWithTraceId(
                 ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
@@ -108,6 +127,8 @@ export class CommandAction<TActionState extends IActionState>
             }
 
             if (ctx.startCooldown) {
+                this.lastCustomCooldown = ctx.customCooldown;
+
                 state.lastExecutedDate = moment().valueOf();
             }
 
@@ -128,30 +149,41 @@ export class CommandAction<TActionState extends IActionState>
         trigger: CommandTrigger,
         state: TActionState
     ) {
+        const triggerCheckResult = this.checkTrigger(ctx, trigger);
+
+        if (!triggerCheckResult.shouldExecute) return triggerCheckResult;
+
         if (!ctx.fromUserId)
-            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
+                'UserIdMissing'
+            );
 
         const isUserAllowed =
             this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
 
         if (!isUserAllowed)
-            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
+                'UserForbidden'
+            );
 
         const lastExecutedDate = moment(state.lastExecutedDate);
         const cooldownInMilliseconds = secondsToMilliseconds(
-            this.cooldownInSeconds
+            this.lastCustomCooldown ?? this.cooldownInfo.seconds
         );
         const onCooldown =
             moment().diff(lastExecutedDate) < cooldownInMilliseconds;
 
-        if (onCooldown) return CommandTriggerCheckResult.DoNotTrigger;
+        if (onCooldown)
+            return CommandTriggerCheckResult.DoNotTrigger('OnCooldown');
 
         const isCustomConditionMet = this.condition(ctx, state);
         if (!isCustomConditionMet)
-            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
+                'CustomConditionNotMet'
+            );
 
-        return this.checkTrigger(ctx, trigger);
+        return triggerCheckResult;
     }
 
     private checkTrigger(
@@ -159,12 +191,12 @@ export class CommandAction<TActionState extends IActionState>
         trigger: CommandTrigger
     ) {
         if (trigger == MessageType.Any || trigger == ctx.messageType)
-            return CommandTriggerCheckResult.Trigger;
+            return CommandTriggerCheckResult.Trigger();
 
         if (typeof trigger == 'string')
             return ctx.messageText.toLowerCase() == trigger.toLowerCase()
-                ? CommandTriggerCheckResult.Trigger
-                : CommandTriggerCheckResult.DoNotTrigger;
+                ? CommandTriggerCheckResult.Trigger()
+                : CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
 
         const matchResults: RegExpExecArray[] = [];
 

package/entities/actions/replyCaptureAction.ts

@@ -45,7 +45,7 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
             .map((x) => this.checkIfShouldBeExecuted(ctx, x))
             .reduce(
                 (acc, curr) => acc.mergeWith(curr),
-                CommandTriggerCheckResult.DoNotTrigger
+                CommandTriggerCheckResult.DoNotTrigger('Other')
             );
 
         if (!shouldExecute) return Noop.NoResponse;
@@ -65,15 +65,20 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
         trigger: CommandTrigger
     ) {
         if (ctx.replyMessageId != this.parentMessageId)
-            return CommandTriggerCheckResult.DoNotTrigger;
+            return CommandTriggerCheckResult.DoNotTrigger(
+                'TriggerNotSatisfied'
+            );
 
         if (trigger == ctx.messageType)
-            return CommandTriggerCheckResult.Trigger;
+            return CommandTriggerCheckResult.Trigger();
 
         if (typeof trigger == 'string')
             if (ctx.messageText.toLowerCase() == trigger.toLowerCase())
-                return CommandTriggerCheckResult.Trigger;
-            else return CommandTriggerCheckResult.DoNotTrigger;
+                return CommandTriggerCheckResult.Trigger();
+            else
+                return CommandTriggerCheckResult.DoNotTrigger(
+                    'TriggerNotSatisfied'
+                );
 
         const matchResults: RegExpExecArray[] = [];
 

package/entities/context/messageContext.ts

@@ -1,5 +1,5 @@
 import { resolve } from 'path';
-import { TelegramEmoji } from 'telegraf/types';
+import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { IActionState } from '../../types/actionState';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
@@ -16,6 +16,7 @@ import {
 } from '../../types/messageTypes';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { CommandAction } from '../actions/commandAction';
+import { Seconds } from '../../types/timeValues';
 
 /**
  * Context of action executed in chat, in response to a message
@@ -39,6 +40,10 @@ export class MessageContext<
     messageType!: MessageTypeValue;
     /** Message object recieved from Telegram */
     messageUpdateObject!: TelegrafContextMessage;
+    /** Bot info from Telegram */
+    botInfo!: UserFromGetMe;
+
+    customCooldown: Seconds | undefined;
 
     private getQuotePart(quote: boolean | string) {
         return typeof quote == 'boolean'
@@ -111,6 +116,11 @@ export class MessageContext<
         return this.createCaptureController(response);
     }
 
+    startCustomCooldown(customCooldown: Seconds) {
+        this.startCooldown = true;
+        this.customCooldown = customCooldown;
+    }
+
     /**
      * Collection of actions that can be done as a reply to a message that triggered this action
      */

package/entities/context/replyContext.ts

@@ -1,4 +1,4 @@
-import { TelegramEmoji } from 'telegraf/types';
+import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
@@ -36,6 +36,8 @@ export class ReplyContext<
     fromUserName!: string;
     /** Message object recieved from Telegram */
     messageUpdateObject!: TelegrafContextMessage;
+    /** Bot info from Telegram */
+    botInfo!: UserFromGetMe;
 
     isInitialized = false;
 

package/helpers/builders/commandActionBuilder.ts

@@ -7,6 +7,7 @@ import { IActionState } from '../../types/actionState';
 import { toArray } from '../toArray';
 import { Noop } from '../noop';
 import { CommandTrigger } from '../../types/commandTrigger';
+import { CooldownInfo } from '../../dtos/cooldownInfo';
 
 /**
  * Builder for `CommandAction` with state represented by `TActionState`
@@ -24,6 +25,7 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
     handler: CommandHandler<TActionState> = Noop.call;
     condition: CommandCondition<TActionState> = Noop.true;
     maxAllowedSimultaniousExecutions: number = 0;
+    cooldownMessage: string | undefined;
 
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
@@ -104,6 +106,15 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
         return this;
     }
 
+    /** Sets action cooldown message.
+     * @param message Message that will be sent if action is on cooldown.
+     */
+    withCooldownMessage(message: string) {
+        this.cooldownMessage = message;
+
+        return this;
+    }
+
     /**
      * Adds a chat to ignore list for this action.
      * @param chatId Chat id to ignore.
@@ -121,7 +132,7 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
             this.handler,
             this.name,
             this.active,
-            this.cooldownSeconds,
+            new CooldownInfo(this.cooldownSeconds, this.cooldownMessage),
             this.blacklist,
             this.allowedUsers,
             this.maxAllowedSimultaniousExecutions,

package/package.json

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

package/services/actionProcessingService.ts

@@ -103,7 +103,8 @@ export class ActionProcessingService {
             api,
             this.telegraf,
             commandActions,
-            verboseLoggingForIncomingMessage ?? false
+            verboseLoggingForIncomingMessage ?? false,
+            botInfo
         );
         this.inlineQueryProcessor.initialize(
             api,

package/services/actionProcessors/commandActionProcessor.ts

@@ -15,9 +15,11 @@ import {
 } from '../../types/messageTypes';
 import { typeSafeObjectFromEntries } from '../../helpers/objectFromEntries';
 import { BaseActionProcessor } from './baseProcessor';
+import { UserFromGetMe } from 'telegraf/types';
 
 export class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures: ReplyCaptureAction<IActionState>[] = [];
+    private botInfo!: UserFromGetMe;
 
     private commands = typeSafeObjectFromEntries(
         Object.values(MessageType).map((x) => [
@@ -30,8 +32,10 @@ export class CommandActionProcessor extends BaseActionProcessor {
         api: TelegramApiService,
         telegraf: Telegraf,
         commands: CommandAction<IActionState>[],
-        verboseLoggingForIncomingMessage: boolean
+        verboseLoggingForIncomingMessage: boolean,
+        botInfo: UserFromGetMe
     ) {
+        this.botInfo = botInfo;
         this.initializeDependencies(api);
 
         for (const msgType of Object.values(MessageType)) {
@@ -173,6 +177,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
         ctx.traceId = message.traceId;
+        ctx.botInfo = this.botInfo;
 
         ctx.isInitialized = true;
         ctx.matchResults = [];
@@ -207,6 +212,8 @@ export class CommandActionProcessor extends BaseActionProcessor {
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
         ctx.traceId = message.traceId;
+        ctx.botInfo = this.botInfo;
+        ctx.customCooldown = undefined;
 
         ctx.logger = this.logger.createScope(
             this.botName,