chz-telegram-bot 0.0.27 → 0.0.28

package/dist/entities/actions/scheduledAction.js

@@ -56,7 +56,7 @@ class ScheduledAction {
     }
     shouldTrigger(state) {
         const today = (0, moment_1.default)().startOf('day').valueOf();
-        const isAllowedToTrigger = (0, moment_1.default)().hour().valueOf() >= this.timeinHours;
+        const isAllowedToTrigger = (0, moment_1.default)().add(1, 'minute').hour().valueOf() >= this.timeinHours;
         const hasTriggeredToday = state.lastExecutedDate >= today;
         return isAllowedToTrigger && !hasTriggeredToday;
     }

package/dist/helpers/inverseRecord.d.ts

@@ -0,0 +1,2 @@
+export declare function inverseRecord<T extends PropertyKey, U extends PropertyKey>(input: Record<T, U>): Record<U, T>;
+//# sourceMappingURL=inverseRecord.d.ts.map

package/dist/helpers/inverseRecord.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inverseRecord.d.ts","sourceRoot":"","sources":["../../helpers/inverseRecord.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,WAAW,EACtE,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAId,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CACpB"}

package/dist/helpers/inverseRecord.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inverseRecord = inverseRecord;
+function inverseRecord(input) {
+    return Object.fromEntries(Object.entries(input).map(([key, value]) => [value, key]));
+}

package/dist/services/telegramApi.d.ts

@@ -19,12 +19,12 @@ export declare class TelegramApiService {
     telegram: Telegram;
     chats: Record<number, string>;
     storage: IStorageClient;
+    interactions: IBotApiInteractions;
     constructor(botName: string, telegram: Telegram, storage: IStorageClient, chats: Record<string, number>);
     flushResponses(): Promise<void>;
     private pinIfShould;
     private processResponse;
     private enqueue;
-    private getInteractions;
     createContextForMessage<TActionState extends IActionState>(incomingMessage: IncomingMessage, command: CommandAction<TActionState>): MessageContext<TActionState>;
     createContextForChat<TActionState extends IActionState>(chatId: number, scheduledAction: ScheduledAction<TActionState>): ChatContext<TActionState>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,WAAW,EAAE,CAAM;IAEjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe;IAQvB,uBAAuB,CAAC,YAAY,SAAS,YAAY,EACrD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAWxC,oBAAoB,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,KAAK,IAAI,CAAC;IACvE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,WAAW,EAAE,CAAM;IAEjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,mBAAmB,CAAC;gBAG9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAc3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,uBAAuB,CAAC,YAAY,SAAS,YAAY,EACrD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAWxC,oBAAoB,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,KAAK,IAAI,CAAC;IACvE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD"}

package/dist/services/telegramApi.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelegramApiService = void 0;
 const chatContext_1 = require("../entities/context/chatContext");
 const messageContext_1 = require("../entities/context/messageContext");
-const reverseRecord_1 = require("../helpers/reverseRecord");
+const inverseRecord_1 = require("../helpers/inverseRecord");
 const logger_1 = require("./logger");
 const promises_1 = require("timers/promises");
 const TELEGRAM_RATELIMIT_DELAY = 35;
@@ -13,8 +13,13 @@ class TelegramApiService {
         this.messageQueue = [];
         this.telegram = telegram;
         this.botName = botName;
-        this.chats = (0, reverseRecord_1.reverseRecord)(chats);
+        this.chats = (0, inverseRecord_1.inverseRecord)(chats);
         this.storage = storage;
+        this.interactions = {
+            react: (reaction) => this.enqueue(reaction),
+            respond: (response) => this.enqueue(response),
+            unpin: (unpinMessage) => this.enqueue(unpinMessage)
+        };
     }
     async flushResponses() {
         if (this.isFlushing)
@@ -87,18 +92,11 @@ class TelegramApiService {
     enqueue(response) {
         this.messageQueue.push(response);
     }
-    getInteractions() {
-        return {
-            react: (reaction) => this.enqueue(reaction),
-            respond: (response) => this.enqueue(response),
-            unpin: (unpinMessage) => this.enqueue(unpinMessage)
-        };
-    }
     createContextForMessage(incomingMessage, command) {
-        return new messageContext_1.MessageContext(this.botName, command, this.getInteractions(), incomingMessage, this.storage);
+        return new messageContext_1.MessageContext(this.botName, command, this.interactions, incomingMessage, this.storage);
     }
     createContextForChat(chatId, scheduledAction) {
-        return new chatContext_1.ChatContext(this.botName, scheduledAction, this.getInteractions(), chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
+        return new chatContext_1.ChatContext(this.botName, scheduledAction, this.interactions, chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
     }
 }
 exports.TelegramApiService = TelegramApiService;

package/entities/actions/scheduledAction.ts

@@ -122,7 +122,7 @@ export class ScheduledAction<TActionState extends IActionState>
         const today = moment().startOf('day').valueOf();
 
         const isAllowedToTrigger =
-            moment().hour().valueOf() >= this.timeinHours;
+            moment().add(1, 'minute').hour().valueOf() >= this.timeinHours;
         const hasTriggeredToday = state.lastExecutedDate >= today;
 
         return isAllowedToTrigger && !hasTriggeredToday;

package/helpers/{reverseRecord.ts → inverseRecord.ts}

@@ -1,4 +1,4 @@
-export function reverseRecord<T extends PropertyKey, U extends PropertyKey>(
+export function inverseRecord<T extends PropertyKey, U extends PropertyKey>(
     input: Record<T, U>
 ) {
     return Object.fromEntries(

package/package.json

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

package/services/telegramApi.ts

@@ -1,7 +1,7 @@
-import { InputFile, Message } from 'telegraf/types';
+import { Message } from 'telegraf/types';
 import { ChatContext } from '../entities/context/chatContext';
 import { MessageContext } from '../entities/context/messageContext';
-import { reverseRecord } from '../helpers/reverseRecord';
+import { inverseRecord as inverseRecord } from '../helpers/inverseRecord';
 import { IStorageClient } from '../types/storage';
 import { Logger } from './logger';
 import { Reaction } from '../entities/responses/reaction';
@@ -28,6 +28,7 @@ export class TelegramApiService {
     telegram: Telegram;
     chats: Record<number, string>;
     storage: IStorageClient;
+    interactions: IBotApiInteractions;
 
     constructor(
         botName: string,
@@ -37,8 +38,14 @@ export class TelegramApiService {
     ) {
         this.telegram = telegram;
         this.botName = botName;
-        this.chats = reverseRecord(chats);
+        this.chats = inverseRecord(chats);
         this.storage = storage;
+
+        this.interactions = {
+            react: (reaction) => this.enqueue(reaction),
+            respond: (response) => this.enqueue(response),
+            unpin: (unpinMessage) => this.enqueue(unpinMessage)
+        } as IBotApiInteractions;
     }
 
     async flushResponses() {
@@ -96,7 +103,7 @@ export class TelegramApiService {
             case 'text':
                 sentMessage = await this.telegram.sendMessage(
                     response.chatId,
-                    response.content as string,
+                    response.content,
                     {
                         reply_to_message_id: response.replyId,
                         parse_mode: 'MarkdownV2',
@@ -110,7 +117,7 @@ export class TelegramApiService {
             case 'image':
                 sentMessage = await this.telegram.sendPhoto(
                     response.chatId,
-                    response.content as InputFile,
+                    response.content,
                     response.replyId
                         ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
                           ({ reply_to_message_id: response.replyId } as any)
@@ -122,7 +129,7 @@ export class TelegramApiService {
             case 'video':
                 sentMessage = await this.telegram.sendVideo(
                     response.chatId,
-                    response.content as InputFile,
+                    response.content,
                     response.replyId
                         ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
                           ({ reply_to_message_id: response.replyId } as any)
@@ -168,14 +175,6 @@ export class TelegramApiService {
         this.messageQueue.push(response);
     }
 
-    private getInteractions() {
-        return {
-            react: (reaction) => this.enqueue(reaction),
-            respond: (response) => this.enqueue(response),
-            unpin: (unpinMessage) => this.enqueue(unpinMessage)
-        } as IBotApiInteractions;
-    }
-
     createContextForMessage<TActionState extends IActionState>(
         incomingMessage: IncomingMessage,
         command: CommandAction<TActionState>
@@ -183,7 +182,7 @@ export class TelegramApiService {
         return new MessageContext<TActionState>(
             this.botName,
             command,
-            this.getInteractions(),
+            this.interactions,
             incomingMessage,
             this.storage
         );
@@ -196,7 +195,7 @@ export class TelegramApiService {
         return new ChatContext<TActionState>(
             this.botName,
             scheduledAction,
-            this.getInteractions(),
+            this.interactions,
             chatId,
             this.chats[chatId],
             `Scheduled:${scheduledAction.key}:${chatId}`,