@aracna/telegram-bot 1.9.10 → 1.9.12

package/childs/download.js

@@ -10,7 +10,7 @@ class Download extends child_1.Child {
         file = await this.telegram.get.file(id);
         if (file instanceof Error)
             return file;
-        buffer = await this.api.get(file.file_path || '');
+        buffer = await this.api.get(file.file_path ?? '');
         if (buffer instanceof Error)
             return buffer;
         return buffer.data;

package/childs/polling.d.ts

@@ -3,7 +3,7 @@ import { Child } from '../modules/child';
 export declare class Polling extends Child {
     active: boolean;
     offset: number;
-    start(ms: number | undefined, parameters: Partial<GetUpdates>): void;
+    start(ms?: number, parameters?: Partial<GetUpdates>): void;
     stop(): void;
     private get;
 }

package/definitions/constants.js

@@ -1,11 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.REGEXP_COMMAND_WITH_USERNAME = exports.REGEXP_COMMAND = void 0;
-// export const REGEXP_ARRAY: RegExp = /^\[.+\]$/
 exports.REGEXP_COMMAND = /\/[a-z_]+/m;
 exports.REGEXP_COMMAND_WITH_USERNAME = /\/[a-zA-Z0-9_@]+/;
-// export const REGEXP_ID: RegExp = /^[a-z0-9]{16}$/
-// export const REGEXP_NUMBER: RegExp = /^(\+|-)?[0-9]+(\.[0-9])?[0-9]*$/
-// export const REGEXP_OBJECT: RegExp = /^\{.+\}$/
-// export const REGEXP_REPLY_TO_MESSAGE_CHAT_ID: RegExp = /:\s(\+|-)?[0-9]+/m
-// export const REGEXP_USERNAME: RegExp = /[a-zA-Z_0-9]{5,32}/

package/index.d.ts

@@ -80,12 +80,6 @@ import { Update } from '@aracna/telegram-bot-types';
 import { User } from '@aracna/telegram-bot-types';
 import { UserProfilePhotos } from '@aracna/telegram-bot-types';
 
-declare class _ {
-    api: ConfigurationAPI;
-    default: ConfigurationDefault;
-    handler: ConfigurationHandler;
-}
-
 declare class Add extends Child {
     stickerToSet(userID: number, name: string, sticker: InputSticker, parameters: Partial<AddStickerToSet>): Promise<Message | FetchError>;
 }
@@ -155,6 +149,12 @@ declare interface ConfigurationAPI {
     };
 }
 
+declare class ConfigurationBuilder {
+    api: ConfigurationAPI;
+    default: ConfigurationDefault;
+    handler: ConfigurationHandler;
+}
+
 declare interface ConfigurationDefault {
     buttons: {
         text: (chatID: number) => Promise<InlineKeyboardButton[]>;
@@ -303,7 +303,7 @@ declare class Pin extends Child {
 declare class Polling extends Child {
     active: boolean;
     offset: number;
-    start(ms: number | undefined, parameters: Partial<GetUpdates>): void;
+    start(ms?: number, parameters?: Partial<GetUpdates>): void;
     stop(): void;
     private get;
 }
@@ -446,7 +446,7 @@ export declare class Telegram {
     private get handlerIDs();
 }
 
-export declare const TelegramConfiguration: _;
+export declare const TelegramConfiguration: ConfigurationBuilder;
 
 export declare enum TelegramLoggerName {
     MODULE = "TELEGRAM_MODULE"

package/modules/configuration.d.ts

@@ -1,8 +1,8 @@
 import { ConfigurationAPI, ConfigurationDefault, ConfigurationHandler } from '../definitions/interfaces';
-declare class _ {
+declare class ConfigurationBuilder {
     api: ConfigurationAPI;
     default: ConfigurationDefault;
     handler: ConfigurationHandler;
 }
-export declare const Configuration: _;
+export declare const Configuration: ConfigurationBuilder;
 export {};

package/modules/configuration.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
 const dummy_1 = require("./dummy");
-class _ {
+class ConfigurationBuilder {
     api = dummy_1.Dummy.configurationAPI;
     default = dummy_1.Dummy.configurationDefault;
     handler = dummy_1.Dummy.configurationHandler;
 }
-exports.Configuration = new _();
+exports.Configuration = new ConfigurationBuilder();

package/modules/telegram.js

@@ -105,8 +105,8 @@ class Telegram {
                 return;
             this.id = v.id;
             this.name.first = v.first_name;
-            this.name.last = v.last_name || '';
-            this.username = v.username || '';
+            this.name.last = v.last_name ?? '';
+            this.username = v.username ?? '';
         });
     }
     on(type, middleware, key, description, options) {
@@ -117,9 +117,14 @@ class Telegram {
         handler.key = key;
         handler.middleware = middleware;
         handler.type = type;
-        handler.options = (0, core_1.mergeObjects)(handler.options, options || {});
+        handler.options = (0, core_1.mergeObjects)(handler.options, options ?? {});
         potential = this.findMatchingHandler(handler.type, handler.key);
-        potential.id ? (potential.middleware = middleware) : this.handlers.push(handler);
+        if (potential.id) {
+            potential.middleware = middleware;
+            module_logger_1.ModuleLogger.debug('Telegram', 'register', `The handler has been updated.`, handler);
+            return;
+        }
+        this.handlers.push(handler);
         module_logger_1.ModuleLogger.debug('Telegram', 'register', `The handler has been registered.`, handler);
     }
     handle(update) {
@@ -305,7 +310,7 @@ class Telegram {
     }
     handleReplyToMessage(reply) {
         let body, handler;
-        body = reply_to_message_utils_1.ReplyToMessageUtils.decodeBody(reply.reply_to_message?.entities || []);
+        body = reply_to_message_utils_1.ReplyToMessageUtils.decodeBody(reply.reply_to_message?.entities ?? []);
         (0, core_1.setObjectProperty)(reply, 'body', body);
         handler = this.findMatchingHandler(enums_1.UpdateType.REPLY_TO_MESSAGE, body.type);
         if (!handler.id)
@@ -334,17 +339,17 @@ class Telegram {
             return handler;
         handler.middleware(start);
         if (handler.id.length > 0 && handler.options.deleteOnMessageStart) {
-            this.delete.message(body.chatID ? start.from?.id || 0 : start.chat.id, start.message_id);
+            this.delete.message(body.chatID ? start.from?.id ?? 0 : start.chat.id, start.message_id);
         }
         return handler;
     }
     findMatchingHandler(type, key = '') {
-        return this.handlers.find((v) => v.key === key && v.type === type) || dummy_1.Dummy.handler;
+        return this.handlers.find((v) => v.key === key && v.type === type) ?? dummy_1.Dummy.handler;
     }
     get commands() {
         return this.handlers
             .filter((v) => v.key && v.type === enums_1.UpdateType.MESSAGE)
-            .map((v) => ({ command: v.key || '', description: v.description || '' }));
+            .map((v) => ({ command: v.key ?? '', description: v.description ?? '' }));
     }
     get handlerIDs() {
         return this.handlers.reduce((r, v) => [...r, v.id], []);

package/package.json

@@ -1,8 +1,8 @@
 {
   "author": "Dario Sechi",
   "devDependencies": {
-    "@aracna/core": "^1.1.75",
-    "@aracna/telegram-bot-types": "^1.2.9",
+    "@aracna/core": "^1.1.77",
+    "@aracna/telegram-bot-types": "^1.2.10",
     "@microsoft/api-extractor": "^7.39.0",
     "@types/node": "^20.10.5",
     "@vitest/coverage-v8": "^1.1.0",
@@ -12,6 +12,10 @@
     "typescript": "^5.3.3",
     "vitest": "^1.1.0"
   },
+  "engines": {
+    "node": ">=16",
+    "pnpm": ">=8"
+  },
   "license": "MIT",
   "main": "index.js",
   "name": "@aracna/telegram-bot",
@@ -23,7 +27,7 @@
     "directory": "dist"
   },
   "types": "index.d.ts",
-  "version": "1.9.10",
+  "version": "1.9.12",
   "scripts": {
     "build": "rm -rf dist && pnpm tsc && pnpm api-extractor run --local",
     "prepublish": "pnpm test && pnpm build && pnpm version patch && cp LICENSE package.json README.md dist",

package/utils/command.utils.js

@@ -20,7 +20,7 @@ class CommandUtils {
         return this.get(string);
     }
     static get(string) {
-        return (constants_1.REGEXP_COMMAND.exec(string?.slice(0, 512) || '') || [''])[0].slice(1);
+        return (constants_1.REGEXP_COMMAND.exec(string?.slice(0, 512) ?? '') ?? [''])[0].slice(1);
     }
     static omit(string) {
         return string.replace(constants_1.REGEXP_COMMAND_WITH_USERNAME, '').trim();

package/utils/context.utils.js

@@ -26,18 +26,16 @@ class ContextUtils {
         return this.getUser(context).first_name;
     }
     static getUserLastName(context) {
-        return this.getUser(context).last_name || '';
+        return this.getUser(context).last_name ?? '';
     }
     static getUserUsername(context) {
-        return this.getUser(context).username || '';
+        return this.getUser(context).username ?? '';
     }
     static getUser(context) {
-        switch (true) {
-            case (0, core_1.hasObjectProperty)(context, 'from'):
-                return (0, core_1.getObjectProperty)(context, 'from', { first_name: '', id: 0, is_bot: false, username: '' });
-            default:
-                return { first_name: '', id: 0, is_bot: false, username: '' };
+        if ((0, core_1.hasObjectProperty)(context, 'from')) {
+            return (0, core_1.getObjectProperty)(context, 'from', { first_name: '', id: 0, is_bot: false, username: '' });
         }
+        return { first_name: '', id: 0, is_bot: false, username: '' };
     }
 }
 exports.ContextUtils = ContextUtils;

package/utils/reply.to.message.utils.js

@@ -7,7 +7,7 @@ class ReplyToMessageUtils {
     static decodeBody(entities) {
         let entity, encoded, body;
         entity = entities[entities.length - 1];
-        if (!entity || !entity.url)
+        if (!entity?.url)
             return dummy_1.Dummy.messageBody;
         encoded = entity.url.replace('https://t.me/?a=', '');
         body = (0, core_1.tc)(() => JSON.parse(Buffer.from(encoded, 'base64').toString()));