chz-telegram-bot 0.3.29 → 0.3.30

package/dist/dtos/chatHistoryMessage.d.ts

@@ -0,0 +1,13 @@
+import { User } from 'telegraf/types';
+import { MessageTypeValue } from '../types/messageTypes';
+import { TraceId } from '../types/trace';
+export declare class ChatHistoryMessage {
+    readonly id: number;
+    readonly from: User | undefined;
+    readonly text: string;
+    readonly type: MessageTypeValue;
+    readonly traceId: TraceId;
+    readonly replyToId: number | undefined;
+    constructor(id: number, from: User | undefined, text: string, type: MessageTypeValue, traceId: TraceId, replyToId: number | undefined);
+}
+//# sourceMappingURL=chatHistoryMessage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"chatHistoryMessage.d.ts","sourceRoot":"","sources":["../../dtos/chatHistoryMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,kBAAkB;IAEvB,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;gBAL7B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,GAAG,SAAS,EACtB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,GAAG,SAAS;CAE7C"}

package/dist/dtos/chatHistoryMessage.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatHistoryMessage = void 0;
+class ChatHistoryMessage {
+    id;
+    from;
+    text;
+    type;
+    traceId;
+    replyToId;
+    constructor(id, from, text, type, traceId, replyToId) {
+        this.id = id;
+        this.from = from;
+        this.text = text;
+        this.type = type;
+        this.traceId = traceId;
+        this.replyToId = replyToId;
+    }
+}
+exports.ChatHistoryMessage = ChatHistoryMessage;

package/dist/dtos/chatInfo.d.ts

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

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

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

package/dist/dtos/incomingMessage.d.ts

@@ -2,6 +2,7 @@ import { User } from 'telegraf/types';
 import { MessageTypeValue, TelegrafContextMessage } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 import { TraceId } from '../types/trace';
+import { ChatHistoryMessage } from './chatHistoryMessage';
 export declare class IncomingMessage {
     readonly messageId: number;
     readonly chatInfo: ChatInfo;
@@ -12,7 +13,7 @@ export declare class IncomingMessage {
     readonly replyToMessageId: number | undefined;
     readonly updateObject: TelegrafContextMessage;
     private detectMessageType;
-    constructor(ctxMessage: TelegrafContextMessage, botName: string, history: IncomingMessage[]);
+    constructor(ctxMessage: TelegrafContextMessage, botName: string, history: ChatHistoryMessage[]);
     private getMessageText;
 }
 //# sourceMappingURL=incomingMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAEH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,eAAe;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAE9C,OAAO,CAAC,iBAAiB;gBAqBrB,UAAU,EAAE,sBAAsB,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EAAE;IAyB9B,OAAO,CAAC,cAAc;CAKzB"}
+{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAEH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,eAAe;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAE9C,OAAO,CAAC,iBAAiB;gBAqBrB,UAAU,EAAE,sBAAsB,EAClC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,kBAAkB,EAAE;IAyBjC,OAAO,CAAC,cAAc;CAKzB"}

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;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAO/C,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwC;IACpE,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;IA2D1B,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YAgCN,cAAc;IA2C5B,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,wBAAwB;CAmCnC"}
+{"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;AAQ/C,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;IACvE,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;IA2D1B,2BAA2B,CACvB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;YAgCN,cAAc;IAoD5B,OAAO,CAAC,6BAA6B;IAiCrC,OAAO,CAAC,wBAAwB;CAmCnC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -11,6 +11,7 @@ const baseProcessor_1 = require("./baseProcessor");
 const mapUtils_1 = require("../../helpers/mapUtils");
 const messageInfo_1 = require("../../dtos/messageInfo");
 const userInfo_1 = require("../../dtos/userInfo");
+const chatHistoryMessage_1 = require("../../dtos/chatHistoryMessage");
 const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
     replyCaptures = [];
@@ -65,7 +66,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         const chatHistoryArray = (0, mapUtils_1.getOrSetIfNotExists)(this.chatHistory, msg.chatInfo.id, []);
         while (chatHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
             chatHistoryArray.shift();
-        chatHistoryArray.push(msg);
+        chatHistoryArray.push(new chatHistoryMessage_1.ChatHistoryMessage(msg.messageId, msg.from, msg.text, msg.type, msg.traceId, msg.replyToMessageId));
         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 != '') {

package/dtos/chatHistoryMessage.ts

@@ -0,0 +1,14 @@
+import { User } from 'telegraf/types';
+import { MessageTypeValue } from '../types/messageTypes';
+import { TraceId } from '../types/trace';
+
+export class ChatHistoryMessage {
+    constructor(
+        readonly id: number,
+        readonly from: User | undefined,
+        readonly text: string,
+        readonly type: MessageTypeValue,
+        readonly traceId: TraceId,
+        readonly replyToId: number | undefined
+    ) {}
+}

package/dtos/chatInfo.ts

@@ -1,4 +1,4 @@
-import { IncomingMessage } from './incomingMessage';
+import { ChatHistoryMessage } from './chatHistoryMessage';
 
 export class ChatInfo {
     constructor(
@@ -7,6 +7,6 @@ export class ChatInfo {
         /** Name of a chat that action is executed in. */
         readonly name: string,
         /** Last 100 messages in chat where action is executed */
-        readonly messageHistory: IncomingMessage[]
+        readonly messageHistory: ChatHistoryMessage[]
     ) {}
 }

package/dtos/incomingMessage.ts

@@ -8,6 +8,7 @@ import {
 import { ChatInfo } from './chatInfo';
 import { createTrace } from '../helpers/traceFactory';
 import { TraceId } from '../types/trace';
+import { ChatHistoryMessage } from './chatHistoryMessage';
 
 export class IncomingMessage {
     readonly messageId: number;
@@ -43,7 +44,7 @@ export class IncomingMessage {
     constructor(
         ctxMessage: TelegrafContextMessage,
         botName: string,
-        history: IncomingMessage[]
+        history: ChatHistoryMessage[]
     ) {
         this.traceId = createTrace(
             this,

package/package.json

@@ -14,7 +14,7 @@
         "type": "git",
         "url": "https://github.com/AlexSolari/botFramework.git"
     },
-    "version": "0.3.29",
+    "version": "0.3.30",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/actionProcessors/commandActionProcessor.ts

@@ -19,12 +19,13 @@ import { UserFromGetMe } from 'telegraf/types';
 import { getOrSetIfNotExists } from '../../helpers/mapUtils';
 import { MessageInfo } from '../../dtos/messageInfo';
 import { UserInfo } from '../../dtos/userInfo';
+import { ChatHistoryMessage } from '../../dtos/chatHistoryMessage';
 
 const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 
 export class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures: ReplyCaptureAction<IActionState>[] = [];
-    private readonly chatHistory = new Map<number, IncomingMessage[]>();
+    private readonly chatHistory = new Map<number, ChatHistoryMessage[]>();
     private botInfo!: UserFromGetMe;
 
     private commands = typeSafeObjectFromEntries(
@@ -143,7 +144,16 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
         while (chatHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
             chatHistoryArray.shift();
-        chatHistoryArray.push(msg);
+        chatHistoryArray.push(
+            new ChatHistoryMessage(
+                msg.messageId,
+                msg.from,
+                msg.text,
+                msg.type,
+                msg.traceId,
+                msg.replyToMessageId
+            )
+        );
 
         const ctx = new MessageContextInternal<IActionState>(
             this.storage,