chz-telegram-bot 0.3.13 → 0.3.15

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -8,9 +8,14 @@ const replyContext_1 = require("../../entities/context/replyContext");
 const messageTypes_1 = require("../../types/messageTypes");
 const objectFromEntries_1 = require("../../helpers/objectFromEntries");
 const baseProcessor_1 = require("./baseProcessor");
+const mapUtils_1 = require("../../helpers/mapUtils");
+const messageInfo_1 = require("../../dtos/messageInfo");
+const userInfo_1 = require("../../dtos/userInfo");
+const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
     replyCaptures = [];
     botInfo;
+    lastMessages = new Map();
     commands = (0, objectFromEntries_1.typeSafeObjectFromEntries)(Object.values(messageTypes_1.MessageType).map((x) => [
         x,
         []
@@ -33,7 +38,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         }
         if (commands.length > 0) {
             telegraf.on('message', (ctx) => {
-                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName);
+                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName, (0, mapUtils_1.getOrSetIfNotExists)(this.lastMessages, ctx.chat.id, []));
                 const logger = this.logger.createScope(this.botName, msg.traceId, msg.chatInfo.name);
                 if (verboseLoggingForIncomingMessage) {
                     logger.logObjectWithTraceId(ctx.update.message);
@@ -57,7 +62,11 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         });
     }
     async processMessage(msg) {
-        const ctx = new messageContext_1.MessageContext(this.storage, this.scheduler);
+        const messageHistoryArray = (0, mapUtils_1.getOrSetIfNotExists)(this.lastMessages, msg.chatInfo.id, []);
+        if (messageHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
+            messageHistoryArray.shift();
+        messageHistoryArray.push(msg);
+        const ctx = new messageContext_1.MessageContextInternal(this.storage, this.scheduler);
         const commandsToCheck = new Set(this.commands[msg.type]);
         if (msg.type != messageTypes_1.MessageType.Text && msg.text != '') {
             this.commands[messageTypes_1.MessageType.Text].forEach((x) => commandsToCheck.add(x));
@@ -67,7 +76,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
             await this.executeAction(commandAction, ctx);
         }
         if (this.replyCaptures.length != 0) {
-            const replyCtx = new replyContext_1.ReplyContext(this.storage, this.scheduler);
+            const replyCtx = new replyContext_1.ReplyContextInternal(this.storage, this.scheduler);
             for (const replyAction of this.replyCaptures) {
                 this.initializeReplyCaptureContext(replyCtx, replyAction, msg);
                 await this.executeAction(replyAction, replyCtx);
@@ -77,14 +86,9 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
     }
     initializeReplyCaptureContext(ctx, action, message) {
         ctx.replyMessageId = message.replyToMessageId;
-        ctx.messageId = message.messageId;
-        ctx.messageText = message.text;
-        ctx.messageType = message.type;
-        ctx.fromUserId = message.from?.id;
-        ctx.fromUserName =
-            (message.from?.first_name ?? 'Unknown user') +
-                (message.from?.last_name ? ` ${message.from.last_name}` : '');
-        ctx.messageUpdateObject = message.updateObject;
+        ctx.messageInfo = new messageInfo_1.MessageInfo(message.messageId, message.text, message.type, message.updateObject);
+        ctx.userInfo = new userInfo_1.UserInfo(message.from?.id ?? -1, (message.from?.first_name ?? 'Unknown user') +
+            (message.from?.last_name ? ` ${message.from.last_name}` : ''));
         ctx.botName = this.botName;
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
@@ -95,14 +99,9 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         ctx.logger = this.logger.createScope(this.botName, message.traceId, message.chatInfo.name);
     }
     initializeMessageContext(ctx, action, message) {
-        ctx.messageId = message.messageId;
-        ctx.messageText = message.text;
-        ctx.messageType = message.type;
-        ctx.fromUserId = message.from?.id;
-        ctx.fromUserName =
-            (message.from?.first_name ?? 'Unknown user') +
-                (message.from?.last_name ? ` ${message.from.last_name}` : '');
-        ctx.messageUpdateObject = message.updateObject;
+        ctx.messageInfo = new messageInfo_1.MessageInfo(message.messageId, message.text, message.type, message.updateObject);
+        ctx.userInfo = new userInfo_1.UserInfo(message.from?.id ?? -1, (message.from?.first_name ?? 'Unknown user') +
+            (message.from?.last_name ? ` ${message.from.last_name}` : ''));
         ctx.matchResults = [];
         ctx.startCooldown = true;
         ctx.responses = [];

package/dist/services/actionProcessors/inlineQueryActionProcessor.js

@@ -27,7 +27,7 @@ class InlineQueryActionProcessor extends baseProcessor_1.BaseActionProcessor {
                 pendingInlineQueries.push(query);
             });
             this.scheduler.createTask('InlineQueryProcessing', async () => {
-                const ctx = new inlineQueryContext_1.InlineQueryContext(this.storage, this.scheduler);
+                const ctx = new inlineQueryContext_1.InlineQueryContextInternal(this.storage, this.scheduler);
                 const queriesToProcess = [...pendingInlineQueries];
                 pendingInlineQueries = [];
                 for (const inlineQuery of queriesToProcess) {

package/dist/services/actionProcessors/scheduledActionProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduledActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/scheduledActionProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAIzE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAgB,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,wBAAyB,SAAQ,mBAAmB;IAC7D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,OAAO,CAAC,SAAS,CAAmC;gBAGhD,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAMnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,EAC1C,MAAM,EAAE,OAAO;YAgDL,YAAY;IAuB1B,OAAO,CAAC,qBAAqB;CAmBhC"}
+{"version":3,"file":"scheduledActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/scheduledActionProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAIzE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAgB,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,wBAAyB,SAAQ,mBAAmB;IAC7D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,OAAO,CAAC,SAAS,CAAmC;gBAGhD,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAMnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,EAC1C,MAAM,EAAE,OAAO;YAgDL,YAAY;IA0B1B,OAAO,CAAC,qBAAqB;CAmBhC"}

package/dist/services/actionProcessors/scheduledActionProcessor.js

@@ -41,10 +41,10 @@ class ScheduledActionProcessor extends baseProcessor_1.BaseActionProcessor {
         }
     }
     async runScheduled() {
-        const ctx = new chatContext_1.ChatContext(this.storage, this.scheduler);
+        const ctx = new chatContext_1.ChatContextInternal(this.storage, this.scheduler);
         for (const [chatName, chatId] of Object.entries(this.chats)) {
             for (const scheduledAction of this.scheduled) {
-                this.initializeChatContext(ctx, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName), (0, traceFactory_1.createTrace)(scheduledAction, this.botName, `${scheduledAction.key}-${chatId}`));
+                this.initializeChatContext(ctx, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName, []), (0, traceFactory_1.createTrace)(scheduledAction, this.botName, `${scheduledAction.key}-${chatId}`));
                 await this.executeAction(scheduledAction, ctx);
             }
         }

package/dist/types/action.d.ts

@@ -1,4 +1,4 @@
-import { BaseContext } from '../entities/context/baseContext';
+import { BaseContextInternal } from '../entities/context/baseContext';
 import { IActionState } from './actionState';
 import { BotResponse } from './response';
 export type ActionKey = string & {
@@ -9,6 +9,6 @@ export interface IActionWithState<TActionState extends IActionState> extends IAc
 }
 export interface IAction {
     readonly key: ActionKey;
-    exec(ctx: BaseContext<IAction>): Promise<BotResponse[]>;
+    exec(ctx: BaseContextInternal<IAction>): Promise<BotResponse[]>;
 }
 //# sourceMappingURL=action.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../types/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB,CAAC,YAAY,SAAS,YAAY,CAC/D,SAAQ,OAAO;IACf,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CAC3D"}
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../types/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB,CAAC,YAAY,SAAS,YAAY,CAC/D,SAAQ,OAAO;IACf,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CACnE"}

package/dist/types/capture.d.ts

@@ -1,4 +1,4 @@
-import { ReplyContext } from '../entities/context/replyContext';
+import { ReplyContextInternal } from '../entities/context/replyContext';
 import { IActionState } from './actionState';
 import { CommandTrigger } from './commandTrigger';
 import { IActionWithState } from './action';
@@ -11,13 +11,13 @@ export interface ICaptureController {
      */
     trigger: CommandTrigger[], 
     /** Callback that will be called on trigger */
-    handler: (replyContext: ReplyContext<TParentActionState>) => Promise<void>, 
+    handler: (replyContext: ReplyContextInternal<TParentActionState>) => Promise<void>, 
     /** Abort controller to abort capturing manually */
     abortController: AbortController) => void;
 }
 export interface IReplyCapture {
     trigger: CommandTrigger[];
-    handler: (replyContext: ReplyContext<IActionState>) => Promise<void>;
+    handler: (replyContext: ReplyContextInternal<IActionState>) => Promise<void>;
     abortController: AbortController;
     action: IActionWithState<IActionState>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,CAAC,kBAAkB,SAAS,YAAY;IACpD;;;;OAIG;IACH,OAAO,EAAE,cAAc,EAAE;IACzB,8CAA8C;IAC9C,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC;IAClB,mDAAmD;IACnD,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,CAAC,kBAAkB,SAAS,YAAY;IACpD;;;;OAIG;IACH,OAAO,EAAE,cAAc,EAAE;IACzB,8CAA8C;IAC9C,OAAO,EAAE,CACL,YAAY,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,KACrD,OAAO,CAAC,IAAI,CAAC;IAClB,mDAAmD;IACnD,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CACL,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,KAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C"}

package/dtos/chatInfo.ts

@@ -1,11 +1,12 @@
-export 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;
+import { IncomingMessage } from './incomingMessage';
 
-    constructor(chatId: number, chatName: string) {
-        this.id = chatId;
-        this.name = chatName;
-    }
+export class ChatInfo {
+    constructor(
+        /** Id of a chat that action is executed in. */
+        readonly id: number,
+        /** Name of a chat that action is executed in. */
+        readonly name: string,
+        /** Last 100 messages in chat where action is executed */
+        readonly messageHistory: IncomingMessage[]
+    ) {}
 }

package/dtos/commandTriggerCheckResult.ts

@@ -20,22 +20,12 @@ export class CommandTriggerCheckResult {
         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,
-        reason?: SkipTriggerReasons
-    ) {
-        this.shouldExecute = shouldExecute;
-        this.matchResults = matchResults;
-        this.skipCooldown = skipCooldown;
-        this.reason = reason;
-    }
+        readonly shouldExecute: boolean,
+        readonly matchResults: RegExpExecArray[],
+        readonly skipCooldown: boolean,
+        readonly reason?: SkipTriggerReasons
+    ) {}
 
     mergeWith(other: CommandTriggerCheckResult) {
         return new CommandTriggerCheckResult(

package/dtos/cooldownInfo.ts

@@ -1,5 +1,10 @@
 import { Seconds } from '../types/timeValues';
 
 export class CooldownInfo {
-    constructor(public seconds: Seconds, public message: string | undefined) {}
+    constructor(
+        /** New one-time cooldown in seconds */
+        readonly seconds: Seconds,
+        /** Cooldown message to be shown */
+        readonly message: string | undefined
+    ) {}
 }

package/dtos/incomingMessage.ts

@@ -40,7 +40,11 @@ export class IncomingMessage {
         return MessageType.Unknown;
     }
 
-    constructor(ctxMessage: TelegrafContextMessage, botName: string) {
+    constructor(
+        ctxMessage: TelegrafContextMessage,
+        botName: string,
+        history: IncomingMessage[]
+    ) {
         this.traceId = createTrace(
             this,
             botName,
@@ -62,7 +66,8 @@ export class IncomingMessage {
             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/dtos/incomingQuery.ts

@@ -1,22 +1,14 @@
 import { TraceId } from '../types/trace';
 
 export class IncomingInlineQuery {
-    readonly queryId: string;
-    readonly query: string;
-    readonly userId: number;
-    readonly traceId: TraceId;
     readonly abortController: AbortController;
 
     constructor(
-        queryId: string,
-        query: string,
-        userId: number,
-        traceId: TraceId
+        readonly queryId: string,
+        readonly query: string,
+        readonly userId: number,
+        readonly traceId: TraceId
     ) {
-        this.queryId = queryId;
-        this.query = query;
-        this.userId = userId;
-        this.traceId = traceId;
         this.abortController = new AbortController();
     }
 }

package/dtos/messageInfo.ts

@@ -0,0 +1,17 @@
+import {
+    MessageTypeValue,
+    TelegrafContextMessage
+} from '../types/messageTypes';
+
+export class MessageInfo {
+    constructor(
+        /** 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
+    ) {}
+}

package/dtos/userInfo.ts

@@ -0,0 +1,8 @@
+export class UserInfo {
+    constructor(
+        /** 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
+    ) {}
+}

package/entities/actions/commandAction.ts

@@ -6,7 +6,7 @@ import { toArray } from '../../helpers/toArray';
 import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/action';
 import { CommandTriggerCheckResult } from '../../dtos/commandTriggerCheckResult';
-import { MessageContext } from '../context/messageContext';
+import { MessageContextInternal } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Noop } from '../../helpers/noop';
 import { MessageType } from '../../types/messageTypes';
@@ -66,7 +66,7 @@ export class CommandAction<TActionState extends IActionState>
         this.key = `command:${this.name.replace('.', '-')}` as ActionKey;
     }
 
-    async exec(ctx: MessageContext<TActionState>) {
+    async exec(ctx: MessageContextInternal<TActionState>) {
         if (!ctx.isInitialized)
             throw new Error(
                 `Context for ${this.key} is not initialized or already consumed`
@@ -108,7 +108,7 @@ export class CommandAction<TActionState extends IActionState>
                             ctx.chatInfo,
                             ctx.traceId,
                             this,
-                            new ReplyInfo(ctx.messageId)
+                            new ReplyInfo(ctx.messageInfo.id)
                         )
                     ];
 
@@ -145,18 +145,22 @@ export class CommandAction<TActionState extends IActionState>
     }
 
     private checkIfShouldBeExecuted(
-        ctx: MessageContext<TActionState>,
+        ctx: MessageContextInternal<TActionState>,
         trigger: CommandTrigger,
         state: TActionState
     ) {
-        if (!ctx.fromUserId)
+        const triggerCheckResult = this.checkTrigger(ctx, trigger);
+
+        if (!triggerCheckResult.shouldExecute) return triggerCheckResult;
+
+        if (!ctx.userInfo.id)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
                 'UserIdMissing'
             );
 
         const isUserAllowed =
             this.allowedUsers.length == 0 ||
-            this.allowedUsers.includes(ctx.fromUserId);
+            this.allowedUsers.includes(ctx.userInfo.id);
 
         if (!isUserAllowed)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown(
@@ -179,18 +183,18 @@ export class CommandAction<TActionState extends IActionState>
                 'CustomConditionNotMet'
             );
 
-        return this.checkTrigger(ctx, trigger);
+        return triggerCheckResult;
     }
 
     private checkTrigger(
-        ctx: MessageContext<TActionState>,
+        ctx: MessageContextInternal<TActionState>,
         trigger: CommandTrigger
     ) {
-        if (trigger == MessageType.Any || trigger == ctx.messageType)
+        if (trigger == MessageType.Any || trigger == ctx.messageInfo.type)
             return CommandTriggerCheckResult.Trigger();
 
         if (typeof trigger == 'string')
-            return ctx.messageText.toLowerCase() == trigger.toLowerCase()
+            return ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase()
                 ? CommandTriggerCheckResult.Trigger()
                 : CommandTriggerCheckResult.DoNotTrigger('TriggerNotSatisfied');
 
@@ -198,14 +202,14 @@ export class CommandAction<TActionState extends IActionState>
 
         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;
 

package/entities/actions/inlineQueryAction.ts

@@ -1,6 +1,6 @@
 import { Noop } from '../../helpers/noop';
 import { ActionKey, IAction } from '../../types/action';
-import { InlineQueryContext } from '../context/inlineQueryContext';
+import { InlineQueryContextInternal } from '../context/inlineQueryContext';
 import { InlineQueryHandler } from '../../types/handlers';
 
 export class InlineQueryAction implements IAction {
@@ -24,7 +24,7 @@ export class InlineQueryAction implements IAction {
         this.key = `inline:${this.name.replace('.', '-')}` as ActionKey;
     }
 
-    async exec(ctx: InlineQueryContext) {
+    async exec(ctx: InlineQueryContextInternal) {
         if (!ctx.isInitialized)
             throw new Error(
                 `Context for ${this.key} is not initialized or already consumed`

package/entities/actions/replyCaptureAction.ts

@@ -3,7 +3,7 @@ import { Noop } from '../../helpers/noop';
 import { IActionState } from '../../types/actionState';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { ActionKey, IAction, IActionWithState } from '../../types/action';
-import { ReplyContext } from '../context/replyContext';
+import { ReplyContextInternal } from '../context/replyContext';
 
 export class ReplyCaptureAction<TParentActionState extends IActionState>
     implements IAction
@@ -11,7 +11,7 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
     readonly parentMessageId: number;
     readonly key: ActionKey;
     readonly handler: (
-        replyContext: ReplyContext<TParentActionState>
+        replyContext: ReplyContextInternal<TParentActionState>
     ) => Promise<void>;
     readonly triggers: CommandTrigger[];
     readonly abortController: AbortController;
@@ -20,7 +20,7 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
         parentMessageId: number,
         parentAction: IActionWithState<TParentActionState>,
         handler: (
-            replyContext: ReplyContext<TParentActionState>
+            replyContext: ReplyContextInternal<TParentActionState>
         ) => Promise<void>,
         triggers: CommandTrigger[],
         abortController: AbortController
@@ -35,7 +35,7 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
             .replace('.', '')}` as ActionKey;
     }
 
-    async exec(ctx: ReplyContext<TParentActionState>) {
+    async exec(ctx: ReplyContextInternal<TParentActionState>) {
         if (!ctx.isInitialized)
             throw new Error(
                 `Context for ${this.key} is not initialized or already consumed`
@@ -61,7 +61,7 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
     }
 
     private checkIfShouldBeExecuted(
-        ctx: ReplyContext<TParentActionState>,
+        ctx: ReplyContextInternal<TParentActionState>,
         trigger: CommandTrigger
     ) {
         if (ctx.replyMessageId != this.parentMessageId)
@@ -69,11 +69,11 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
                 'TriggerNotSatisfied'
             );
 
-        if (trigger == ctx.messageType)
+        if (trigger == ctx.messageInfo.type)
             return CommandTriggerCheckResult.Trigger();
 
         if (typeof trigger == 'string')
-            if (ctx.messageText.toLowerCase() == trigger.toLowerCase())
+            if (ctx.messageInfo.text.toLowerCase() == trigger.toLowerCase())
                 return CommandTriggerCheckResult.Trigger();
             else
                 return CommandTriggerCheckResult.DoNotTrigger(
@@ -84,14 +84,14 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
 
         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;
 

package/entities/actions/scheduledAction.ts

@@ -6,7 +6,7 @@ import { HoursOfDay } from '../../types/timeValues';
 import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/action';
 import { CachedStateFactory } from '../cachedStateFactory';
-import { ChatContext } from '../context/chatContext';
+import { ChatContextInternal } from '../context/chatContext';
 import { Noop } from '../../helpers/noop';
 import { IScheduler } from '../../types/scheduler';
 import { getOrSetIfNotExists, getOrThrow } from '../../helpers/mapUtils';
@@ -46,7 +46,7 @@ export class ScheduledAction<TActionState extends IActionState>
         this.stateConstructor = stateConstructor;
     }
 
-    async exec(ctx: ChatContext<TActionState>) {
+    async exec(ctx: ChatContextInternal<TActionState>) {
         if (!ctx.isInitialized)
             throw new Error(
                 `Context for ${this.key} is not initialized or already consumed`

package/entities/context/baseContext.ts

@@ -7,7 +7,17 @@ import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { TraceId } from '../../types/trace';
 
-export abstract class BaseContext<TAction extends IAction> {
+export type BaseContextPropertiesToOmit =
+    | 'action'
+    | 'isInitialized'
+    | 'storage'
+    | 'scheduler'
+    | 'logger'
+    | 'responses'
+    | 'traceId'
+    | 'botName';
+
+export abstract class BaseContextInternal<TAction extends IAction> {
     isInitialized = false;
     private _responses: BotResponse[] = [];
 

package/entities/context/chatContext.ts

@@ -14,17 +14,28 @@ import { Milliseconds } from '../../types/timeValues';
 import { DelayResponse } from '../../dtos/responses/delay';
 import { ICaptureController } from '../../types/capture';
 import { CommandTrigger } from '../../types/commandTrigger';
-import { ReplyContext } from './replyContext';
-import { BaseContext } from './baseContext';
+import { ReplyContextInternal } from './replyContext';
+import {
+    BaseContextInternal,
+    BaseContextPropertiesToOmit
+} from './baseContext';
 import { ScheduledAction } from '../actions/scheduledAction';
 
+export type ChatContext<
+    TActionState extends IActionState,
+    TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>
+> = Omit<
+    ChatContextInternal<TActionState, TAction>,
+    BaseContextPropertiesToOmit
+>;
+
 /**
  * Context of action executed in chat.
  */
-export class ChatContext<
+export class ChatContextInternal<
     TActionState extends IActionState,
     TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>
-> extends BaseContext<TAction> {
+> extends BaseContextInternal<TAction> {
     protected createCaptureController(
         response: IReplyResponse
     ): ICaptureController {
@@ -32,7 +43,7 @@ export class ChatContext<
             captureReplies: (
                 trigger: CommandTrigger[],
                 handler: (
-                    replyContext: ReplyContext<TActionState>
+                    replyContext: ReplyContextInternal<TActionState>
                 ) => Promise<void>,
                 abortController: AbortController
             ) => {

package/entities/context/inlineQueryContext.ts

@@ -2,9 +2,17 @@ import { InlineQueryResult } from 'telegraf/types';
 import { BotResponse } from '../../types/response';
 import { InlineQueryAction } from '../actions/inlineQueryAction';
 import { InlineQueryResponse } from '../../dtos/responses/inlineQueryResponse';
-import { BaseContext } from './baseContext';
+import {
+    BaseContextInternal,
+    BaseContextPropertiesToOmit
+} from './baseContext';
 
-export class InlineQueryContext extends BaseContext<InlineQueryAction> {
+export type InlineQueryContext = Omit<
+    InlineQueryContextInternal,
+    BaseContextPropertiesToOmit | 'queryResults' | 'queryId'
+>;
+
+export class InlineQueryContextInternal extends BaseContextInternal<InlineQueryAction> {
     queryResults: InlineQueryResult[] = [];
     /**
      * Abort signal to be utilized in query handler.