chz-telegram-bot 0.3.13 → 0.3.15

package/entities/context/messageContext.ts

@@ -5,51 +5,46 @@ import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { VideoMessage } from '../../dtos/responses/videoMessage';
-import { ChatContext } from './chatContext';
+import { ChatContextInternal } from './chatContext';
 import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
-import {
-    MessageTypeValue,
-    TelegrafContextMessage
-} from '../../types/messageTypes';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { CommandAction } from '../actions/commandAction';
 import { Seconds } from '../../types/timeValues';
+import { BaseContextPropertiesToOmit } from './baseContext';
+import { MessageInfo } from '../../dtos/messageInfo';
+import { UserInfo } from '../../dtos/userInfo';
+
+export type MessageContext<TActionState extends IActionState> = Omit<
+    MessageContextInternal<TActionState>,
+    BaseContextPropertiesToOmit | 'startCooldown' | 'customCooldown'
+>;
 
 /**
  * Context of action executed in chat, in response to a message
  */
-export class MessageContext<
+export class MessageContextInternal<
     TActionState extends IActionState
-> extends ChatContext<TActionState, CommandAction<TActionState>> {
-    /** Id of a message that triggered this action. */
-    messageId!: number;
-    /** Text of a message that triggered this action. */
-    messageText!: string;
+> extends ChatContextInternal<TActionState, CommandAction<TActionState>> {
+    /** Information about the user that triggered this action */
+    userInfo!: UserInfo;
+    /** Information about the message that triggered this action */
+    messageInfo!: MessageInfo;
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults: RegExpMatchArray[] = [];
-    /** Id of a user that sent a message that triggered this action. */
-    fromUserId: number | undefined;
     /** Indicates if cooldown should be started after action is executed. Set to `true` by default. */
     startCooldown: boolean = true;
-    /** Name of a user that sent a message that triggered this action. */
-    fromUserName!: string;
-    /** Type of message being received */
-    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'
             ? this.matchResults.length != 0
                 ? this.matchResults[0][1]
-                : this.messageText
+                : this.messageInfo.text
             : quote;
     }
 
@@ -65,7 +60,7 @@ export class MessageContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -86,7 +81,7 @@ export class MessageContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -107,7 +102,7 @@ export class MessageContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -116,6 +111,10 @@ export class MessageContext<
         return this.createCaptureController(response);
     }
 
+    skipCooldown() {
+        this.startCooldown = false;
+    }
+
     startCustomCooldown(customCooldown: Seconds) {
         this.startCooldown = true;
         this.customCooldown = customCooldown;
@@ -202,7 +201,7 @@ export class MessageContext<
                 new Reaction(
                     this.traceId,
                     this.chatInfo,
-                    this.messageId,
+                    this.messageInfo.id,
                     emoji,
                     this.action
                 )

package/entities/context/replyContext.ts

@@ -9,33 +9,34 @@ import {
     TextMessageSendingOptions,
     MessageSendingOptions
 } from '../../types/messageSendingOptions';
-import {
-    MessageTypeValue,
-    TelegrafContextMessage
-} from '../../types/messageTypes';
 import { ReplyCaptureAction } from '../actions/replyCaptureAction';
 import { resolve } from 'path';
-import { BaseContext } from './baseContext';
-
-export class ReplyContext<
+import {
+    BaseContextInternal,
+    BaseContextPropertiesToOmit
+} from './baseContext';
+import { UserInfo } from '../../dtos/userInfo';
+import { MessageInfo } from '../../dtos/messageInfo';
+
+export type ReplyContext<TActionState extends IActionState> = Omit<
+    ReplyContextInternal<TActionState>,
+    | BaseContextPropertiesToOmit
+    | 'messageId'
+    | 'startCooldown'
+    | 'customCooldown'
+>;
+
+export class ReplyContextInternal<
     TParentActionState extends IActionState
-> extends BaseContext<ReplyCaptureAction<TParentActionState>> {
+> extends BaseContextInternal<ReplyCaptureAction<TParentActionState>> {
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults!: RegExpExecArray[];
     /** Id of a message that triggered this action. */
     replyMessageId!: number | undefined;
-    /** Id of a message that triggered this action. */
-    messageId!: number;
-    /** Type of message being received */
-    messageType!: MessageTypeValue;
-    /** Text of a message that triggered this action. */
-    messageText!: string;
-    /** Id of a user that sent a message that triggered this action. */
-    fromUserId: number | undefined;
-    /** Name of a user that sent a message that triggered this action. */
-    fromUserName!: string;
-    /** Message object recieved from Telegram */
-    messageUpdateObject!: TelegrafContextMessage;
+    /** Information about the user that triggered this action */
+    userInfo!: UserInfo;
+    /** Information about the message that triggered this action */
+    messageInfo!: MessageInfo;
     /** Bot info from Telegram */
     botInfo!: UserFromGetMe;
 
@@ -45,7 +46,7 @@ export class ReplyContext<
         return typeof quote == 'boolean'
             ? this.matchResults.length != 0
                 ? this.matchResults[0][1]
-                : this.messageText
+                : this.messageInfo.text
             : quote;
     }
 
@@ -61,7 +62,7 @@ export class ReplyContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -80,7 +81,7 @@ export class ReplyContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -99,7 +100,7 @@ export class ReplyContext<
             this.chatInfo,
             this.traceId,
             this.action,
-            new ReplyInfo(this.messageId, quote ? quotedPart : undefined),
+            new ReplyInfo(this.messageInfo.id, quote ? quotedPart : undefined),
             options
         );
 
@@ -203,7 +204,7 @@ export class ReplyContext<
                 new Reaction(
                     this.traceId,
                     this.chatInfo,
-                    this.messageId,
+                    this.messageInfo.id,
                     emoji,
                     this.action
                 )

package/helpers/mapUtils.ts

@@ -1,4 +1,13 @@
-export function getOrSetIfNotExists<K, V>(map: Map<K, V>, key: K, fallback: V) {
+type KeyedReadonlyCollection<K, V> = { get: (key: K) => V | undefined };
+type KeyedWriteableCollection<K, V> = KeyedReadonlyCollection<K, V> & {
+    set: (key: K, value: V) => KeyedWriteableCollection<K, V>;
+};
+
+export function getOrSetIfNotExists<K, V>(
+    map: KeyedWriteableCollection<K, V>,
+    key: K,
+    fallback: V
+) {
     const existingValue = map.get(key);
     if (existingValue) return existingValue;
 
@@ -7,7 +16,11 @@ export function getOrSetIfNotExists<K, V>(map: Map<K, V>, key: K, fallback: V) {
     return fallback;
 }
 
-export function getOrThrow<K, V>(map: Map<K, V>, key: K, error: string) {
+export function getOrThrow<K, V>(
+    map: KeyedReadonlyCollection<K, V>,
+    key: K,
+    error: string = 'Key not found in collection'
+) {
     const existingValue = map.get(key);
     if (existingValue) return existingValue;
 

package/package.json

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

package/services/actionProcessors/baseProcessor.ts

@@ -3,7 +3,7 @@ import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { TelegramApiService } from '../telegramApi';
 import { IAction } from '../../types/action';
-import { BaseContext } from '../../entities/context/baseContext';
+import { BaseContextInternal } from '../../entities/context/baseContext';
 
 export abstract class BaseActionProcessor {
     protected readonly storage: IStorageClient;
@@ -29,7 +29,7 @@ export abstract class BaseActionProcessor {
 
     private defaultErrorHandler<TAction extends IAction>(
         error: Error,
-        ctx: BaseContext<TAction>
+        ctx: BaseContextInternal<TAction>
     ) {
         ctx.logger.errorWithTraceId(error, ctx);
     }
@@ -40,7 +40,7 @@ export abstract class BaseActionProcessor {
 
     async executeAction<
         TAction extends IAction,
-        TActionContext extends BaseContext<TAction>
+        TActionContext extends BaseContextInternal<TAction>
     >(
         action: TAction,
         ctx: TActionContext,

package/services/actionProcessors/commandActionProcessor.ts

@@ -2,8 +2,8 @@ import { Telegraf } from 'telegraf';
 import { IncomingMessage } from '../../dtos/incomingMessage';
 import { CommandAction } from '../../entities/actions/commandAction';
 import { ReplyCaptureAction } from '../../entities/actions/replyCaptureAction';
-import { MessageContext } from '../../entities/context/messageContext';
-import { ReplyContext } from '../../entities/context/replyContext';
+import { MessageContextInternal } from '../../entities/context/messageContext';
+import { ReplyContextInternal } from '../../entities/context/replyContext';
 import { IActionState } from '../../types/actionState';
 import { TelegramApiService } from '../telegramApi';
 import { IReplyCapture } from '../../types/capture';
@@ -16,10 +16,16 @@ import {
 import { typeSafeObjectFromEntries } from '../../helpers/objectFromEntries';
 import { BaseActionProcessor } from './baseProcessor';
 import { UserFromGetMe } from 'telegraf/types';
+import { getOrSetIfNotExists } from '../../helpers/mapUtils';
+import { MessageInfo } from '../../dtos/messageInfo';
+import { UserInfo } from '../../dtos/userInfo';
+
+const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 
 export class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures: ReplyCaptureAction<IActionState>[] = [];
     private botInfo!: UserFromGetMe;
+    private lastMessages = new Map<number, IncomingMessage[]>();
 
     private commands = typeSafeObjectFromEntries(
         Object.values(MessageType).map((x) => [
@@ -67,7 +73,8 @@ export class CommandActionProcessor extends BaseActionProcessor {
             telegraf.on('message', (ctx) => {
                 const msg = new IncomingMessage(
                     ctx.update.message,
-                    this.botName
+                    this.botName,
+                    getOrSetIfNotExists(this.lastMessages, ctx.chat.id, [])
                 );
 
                 const logger = this.logger.createScope(
@@ -127,7 +134,16 @@ export class CommandActionProcessor extends BaseActionProcessor {
         });
     }
     private async processMessage(msg: IncomingMessage) {
-        const ctx = new MessageContext<IActionState>(
+        const messageHistoryArray = getOrSetIfNotExists(
+            this.lastMessages,
+            msg.chatInfo.id,
+            []
+        );
+        if (messageHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
+            messageHistoryArray.shift();
+        messageHistoryArray.push(msg);
+
+        const ctx = new MessageContextInternal<IActionState>(
             this.storage,
             this.scheduler
         );
@@ -145,7 +161,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
         }
 
         if (this.replyCaptures.length != 0) {
-            const replyCtx = new ReplyContext<IActionState>(
+            const replyCtx = new ReplyContextInternal<IActionState>(
                 this.storage,
                 this.scheduler
             );
@@ -160,19 +176,22 @@ export class CommandActionProcessor extends BaseActionProcessor {
     }
 
     private initializeReplyCaptureContext(
-        ctx: ReplyContext<IActionState>,
+        ctx: ReplyContextInternal<IActionState>,
         action: ReplyCaptureAction<IActionState>,
         message: IncomingMessage
     ) {
         ctx.replyMessageId = message.replyToMessageId;
-        ctx.messageId = message.messageId;
-        ctx.messageText = message.text;
-        ctx.messageType = message.type;
-        ctx.fromUserId = message.from?.id;
-        ctx.fromUserName =
+        ctx.messageInfo = new MessageInfo(
+            message.messageId,
+            message.text,
+            message.type,
+            message.updateObject
+        );
+        ctx.userInfo = new UserInfo(
+            message.from?.id ?? -1,
             (message.from?.first_name ?? 'Unknown user') +
-            (message.from?.last_name ? ` ${message.from.last_name}` : '');
-        ctx.messageUpdateObject = message.updateObject;
+                (message.from?.last_name ? ` ${message.from.last_name}` : '')
+        );
         ctx.botName = this.botName;
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
@@ -190,18 +209,21 @@ export class CommandActionProcessor extends BaseActionProcessor {
     }
 
     private initializeMessageContext(
-        ctx: MessageContext<IActionState>,
+        ctx: MessageContextInternal<IActionState>,
         action: CommandAction<IActionState>,
         message: IncomingMessage
     ) {
-        ctx.messageId = message.messageId;
-        ctx.messageText = message.text;
-        ctx.messageType = message.type;
-        ctx.fromUserId = message.from?.id;
-        ctx.fromUserName =
+        ctx.messageInfo = new MessageInfo(
+            message.messageId,
+            message.text,
+            message.type,
+            message.updateObject
+        );
+        ctx.userInfo = new UserInfo(
+            message.from?.id ?? -1,
             (message.from?.first_name ?? 'Unknown user') +
-            (message.from?.last_name ? ` ${message.from.last_name}` : '');
-        ctx.messageUpdateObject = message.updateObject;
+                (message.from?.last_name ? ` ${message.from.last_name}` : '')
+        );
 
         ctx.matchResults = [];
         ctx.startCooldown = true;

package/services/actionProcessors/inlineQueryActionProcessor.ts

@@ -1,7 +1,7 @@
 import { Telegraf } from 'telegraf';
 import { IncomingInlineQuery } from '../../dtos/incomingQuery';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
-import { InlineQueryContext } from '../../entities/context/inlineQueryContext';
+import { InlineQueryContextInternal } from '../../entities/context/inlineQueryContext';
 import { createTrace } from '../../helpers/traceFactory';
 import { Milliseconds } from '../../types/timeValues';
 import { TraceId } from '../../types/trace';
@@ -67,7 +67,7 @@ export class InlineQueryActionProcessor extends BaseActionProcessor {
             this.scheduler.createTask(
                 'InlineQueryProcessing',
                 async () => {
-                    const ctx = new InlineQueryContext(
+                    const ctx = new InlineQueryContextInternal(
                         this.storage,
                         this.scheduler
                     );
@@ -119,7 +119,7 @@ export class InlineQueryActionProcessor extends BaseActionProcessor {
     }
 
     private initializeInlineQueryContext(
-        ctx: InlineQueryContext,
+        ctx: InlineQueryContextInternal,
         queryText: string,
         queryId: string,
         action: InlineQueryAction,

package/services/actionProcessors/scheduledActionProcessor.ts

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import { ChatInfo } from '../../dtos/chatInfo';
 import { ScheduledAction } from '../../entities/actions/scheduledAction';
-import { ChatContext } from '../../entities/context/chatContext';
+import { ChatContextInternal } from '../../entities/context/chatContext';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
 import { createTrace } from '../../helpers/traceFactory';
 import { IActionState } from '../../types/actionState';
@@ -81,14 +81,17 @@ export class ScheduledActionProcessor extends BaseActionProcessor {
     }
 
     private async runScheduled() {
-        const ctx = new ChatContext<IActionState>(this.storage, this.scheduler);
+        const ctx = new ChatContextInternal<IActionState>(
+            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(chatId, chatName),
+                    new ChatInfo(chatId, chatName, []),
                     createTrace(
                         scheduledAction,
                         this.botName,
@@ -104,7 +107,7 @@ export class ScheduledActionProcessor extends BaseActionProcessor {
     }
 
     private initializeChatContext(
-        ctx: ChatContext<IActionState>,
+        ctx: ChatContextInternal<IActionState>,
         action: ScheduledAction<IActionState>,
         chatInfo: ChatInfo,
         traceId: TraceId

package/types/action.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';
 
@@ -11,5 +11,5 @@ export interface IActionWithState<TActionState extends IActionState>
 
 export interface IAction {
     readonly key: ActionKey;
-    exec(ctx: BaseContext<IAction>): Promise<BotResponse[]>;
+    exec(ctx: BaseContextInternal<IAction>): Promise<BotResponse[]>;
 }

package/types/capture.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';
@@ -13,7 +13,7 @@ export interface ICaptureController {
         trigger: CommandTrigger[],
         /** Callback that will be called on trigger */
         handler: (
-            replyContext: ReplyContext<TParentActionState>
+            replyContext: ReplyContextInternal<TParentActionState>
         ) => Promise<void>,
         /** Abort controller to abort capturing manually */
         abortController: AbortController
@@ -22,7 +22,9 @@ export interface ICaptureController {
 
 export interface IReplyCapture {
     trigger: CommandTrigger[];
-    handler: (replyContext: ReplyContext<IActionState>) => Promise<void>;
+    handler: (
+        replyContext: ReplyContextInternal<IActionState>
+    ) => Promise<void>;
     abortController: AbortController;
     action: IActionWithState<IActionState>;
 }