chz-telegram-bot 0.1.17 → 0.1.19

package/dist/dtos/incomingMessage.d.ts

@@ -1,5 +1,5 @@
-import { Message, Update, User } from 'telegraf/types';
-import { MessageTypeValue } from '../types/messageTypes';
+import { User } from 'telegraf/types';
+import { MessageTypeValue, TelegrafContextMessage } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 import { TraceId } from '../types/trace';
 export declare class IncomingMessage {
@@ -9,7 +9,8 @@ export declare class IncomingMessage {
     readonly text: string;
     readonly type: MessageTypeValue;
     readonly traceId: TraceId;
+    readonly updateObject: TelegrafContextMessage;
     private detectMessageType;
-    constructor(ctxMessage: Update.New & (Update.NonChannel & Message), botName: string);
+    constructor(ctxMessage: TelegrafContextMessage, botName: string);
 }
 //# 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,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,eAAe;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,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;IAE1B,OAAO,CAAC,iBAAiB;gBAmBrB,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,EACtD,OAAO,EAAE,MAAM;CAkBtB"}
+{"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,UAAU,EAAE,MAAM,CAAC;IAC5B,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;IAE1B,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAE9C,OAAO,CAAC,iBAAiB;gBAmBb,UAAU,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM;CAkBlE"}

package/dist/dtos/incomingMessage.js

@@ -7,6 +7,8 @@ const chatInfo_1 = require("./chatInfo");
 const traceFactory_1 = require("../helpers/traceFactory");
 class IncomingMessage {
     detectMessageType(message) {
+        if ('forward_origin' in message)
+            return messageTypes_1.MessageType.Forward;
         if ('text' in message)
             return messageTypes_1.MessageType.Text;
         if ('photo' in message)
@@ -40,6 +42,7 @@ class IncomingMessage {
             ? ctxMessage.chat.title + ' ' + ctxMessage.chat.id
             : 'DM');
         this.type = this.detectMessageType(ctxMessage);
+        this.updateObject = ctxMessage;
     }
 }
 exports.IncomingMessage = IncomingMessage;

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

@@ -5,7 +5,7 @@ import { ChatContext } from './chatContext';
 import { IncomingMessage } from '../../dtos/incomingMessage';
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/statefulAction';
-import { MessageTypeValue } from '../../types/messageTypes';
+import { MessageTypeValue, TelegrafContextMessage } from '../../types/messageTypes';
 import { ILogger } from '../../types/logger';
 import { IScheduler } from '../../types/scheduler';
 /**
@@ -26,6 +26,8 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     fromUserName: string;
     /** Type of message being received */
     messageType: MessageTypeValue;
+    /** Message object recieved from Telegram */
+    messageUpdateObject: TelegrafContextMessage;
     constructor(storage: IStorageClient, logger: ILogger, scheduler: IScheduler);
     initializeMessageContext(botName: string, action: IActionWithState<TActionState>, message: IncomingMessage): this;
     /**

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,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,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;gBAG3B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,UAAU;IAKzB,wBAAwB,CACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,OAAO,EAAE,eAAe;IAqB5B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}
+{"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,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACH,gBAAgB,EAChB,sBAAsB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,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;gBAGzC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,UAAU;IAKzB,wBAAwB,CACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,OAAO,EAAE,eAAe;IAsB5B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}

package/dist/entities/context/messageContext.js

@@ -27,6 +27,7 @@ class MessageContext extends chatContext_1.ChatContext {
         this.fromUserName =
             (message.from?.first_name ?? 'Unknown user') +
                 (message.from?.last_name ? ` ${message.from.last_name}` : '');
+        this.messageUpdateObject = message.updateObject;
         this.matchResults = [];
         this.startCooldown = true;
         return this.initializeChatContext(botName, action, message.chatInfo, message.traceId);

package/dist/types/messageTypes.d.ts

@@ -1,3 +1,4 @@
+import { Message, Update } from 'telegraf/types';
 export declare const MessageType: {
     readonly Text: "__msg:Text";
     readonly Sticker: "__msg:Sticker";
@@ -10,7 +11,9 @@ export declare const MessageType: {
     readonly Poll: "__msg:Poll";
     readonly Location: "__msg:Location";
     readonly Photo: "__msg:Photo";
+    readonly Forward: "__msg:Forward";
     readonly Unknown: "__msg:Unknown";
 };
 export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];
+export type TelegrafContextMessage = Update.New & (Update.NonChannel & Message);
 //# sourceMappingURL=messageTypes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;;CAad,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcd,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC"}

package/dist/types/messageTypes.js

@@ -13,5 +13,6 @@ exports.MessageType = {
     Poll: '__msg:Poll',
     Location: '__msg:Location',
     Photo: '__msg:Photo',
+    Forward: '__msg:Forward',
     Unknown: '__msg:Unknown'
 };

package/dtos/incomingMessage.ts

@@ -1,6 +1,10 @@
 import { Message, Update, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
-import { MessageType, MessageTypeValue } from '../types/messageTypes';
+import {
+    MessageType,
+    MessageTypeValue,
+    TelegrafContextMessage
+} from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 import { createTrace } from '../helpers/traceFactory';
 import { TraceId } from '../types/trace';
@@ -13,9 +17,12 @@ export class IncomingMessage {
     readonly type: MessageTypeValue;
     readonly traceId: TraceId;
 
+    readonly updateObject: TelegrafContextMessage;
+
     private detectMessageType(
         message: Update.New & (Update.NonChannel & Message)
     ) {
+        if ('forward_origin' in message) return MessageType.Forward;
         if ('text' in message) return MessageType.Text;
         if ('photo' in message) return MessageType.Photo;
         if ('sticker' in message) return MessageType.Sticker;
@@ -31,10 +38,7 @@ export class IncomingMessage {
         return MessageType.Unknown;
     }
 
-    constructor(
-        ctxMessage: Update.New & (Update.NonChannel & Message),
-        botName: string
-    ) {
+    constructor(ctxMessage: TelegrafContextMessage, botName: string) {
         this.traceId = createTrace(
             this,
             botName,
@@ -50,5 +54,6 @@ export class IncomingMessage {
                 : 'DM'
         );
         this.type = this.detectMessageType(ctxMessage);
+        this.updateObject = ctxMessage;
     }
 }

package/entities/context/messageContext.ts

@@ -14,7 +14,10 @@ import {
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
 import { IActionWithState, ActionKey } from '../../types/statefulAction';
-import { MessageTypeValue } from '../../types/messageTypes';
+import {
+    MessageTypeValue,
+    TelegrafContextMessage
+} from '../../types/messageTypes';
 import { ILogger } from '../../types/logger';
 import { IScheduler } from '../../types/scheduler';
 /**
@@ -37,6 +40,8 @@ export class MessageContext<
     fromUserName!: string;
     /** Type of message being received */
     messageType!: MessageTypeValue;
+    /** Message object recieved from Telegram */
+    messageUpdateObject!: TelegrafContextMessage;
 
     constructor(
         storage: IStorageClient,
@@ -58,6 +63,7 @@ export class MessageContext<
         this.fromUserName =
             (message.from?.first_name ?? 'Unknown user') +
             (message.from?.last_name ? ` ${message.from.last_name}` : '');
+        this.messageUpdateObject = message.updateObject;
 
         this.matchResults = [];
         this.startCooldown = true;

package/eslint.config.js

@@ -5,6 +5,7 @@ export default tseslint.config(
     eslint.configs.recommended,
     ...tseslint.configs.recommended,
     {
+        ignores: ['dist/*'],
         rules: {
             '@typescript-eslint/no-unused-vars': [
                 'error',

package/package.json

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

package/types/messageTypes.ts

@@ -1,3 +1,5 @@
+import { Message, Update } from 'telegraf/types';
+
 export const MessageType = {
     Text: '__msg:Text',
     Sticker: '__msg:Sticker',
@@ -10,7 +12,10 @@ export const MessageType = {
     Poll: '__msg:Poll',
     Location: '__msg:Location',
     Photo: '__msg:Photo',
+    Forward: '__msg:Forward',
     Unknown: '__msg:Unknown'
 } as const;
 
 export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];
+
+export type TelegrafContextMessage = Update.New & (Update.NonChannel & Message);