@aracna/telegram-bot 2.0.1 → 2.0.3

package/definitions/interfaces.d.ts

@@ -1,11 +1,11 @@
 import type { BusinessConnection, BusinessMessagesDeleted, ChatBoostRemoved, ChatBoostUpdated, ChatJoinRequest, ChatMemberUpdated, ChosenInlineResult, DeleteWebhook, EditMessageMedia, GetUpdates, InlineQuery, InputMediaAudio, InputMediaDocument, InputMediaPhoto, InputMediaVideo, Message, MessageReactionCountUpdated, MessageReactionUpdated, CallbackQuery as NativeCallbackQuery, Poll, PollAnswer, PreCheckoutQuery, SendMediaGroup, SendMessage, SendPaidMedia, SetWebhook, ShippingQuery } from '@aracna/telegram-bot-types';
 import type { ClientListenerMiddleware, InputFile, UpdateType } from './types';
-export interface CallbackQuery<T = unknown> extends NativeCallbackQuery {
+export interface CallbackQuery<T = any> extends NativeCallbackQuery {
     body: CallbackQueryBody<T>;
 }
-export interface CallbackQueryBody<T = unknown> {
+export interface CallbackQueryBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }
 export interface ClientConnectionOptions {
@@ -66,17 +66,20 @@ export interface Context {
 export interface EditMessageMediaAlternative extends Omit<EditMessageMedia, 'media'> {
     media: InputMediaAlternative;
 }
-export interface EncodeCallbackQueryBodyOptions {
+export interface EncodeCallbackQueryBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
-export interface EncodeReplyToMessageBodyOptions {
+export interface EncodeReplyToMessageBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
-export interface EncodeStartBodyOptions {
+export interface EncodeStartBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
 export interface InputMediaAlternative extends Omit<InputMediaAudio | InputMediaDocument | InputMediaPhoto | InputMediaVideo, 'media'> {
     media: InputFile;
@@ -84,12 +87,12 @@ export interface InputMediaAlternative extends Omit<InputMediaAudio | InputMedia
 export interface InputPaidMediaAlternative extends Omit<InputMediaPhoto | InputMediaVideo, 'media'> {
     media: InputFile;
 }
-export interface ReplyToMessage<T = unknown> extends Message {
+export interface ReplyToMessage<T = any> extends Message {
     body: ReplyToMessageBody<T>;
 }
-export interface ReplyToMessageBody<T = unknown> {
+export interface ReplyToMessageBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }
 export interface SendMediaGroupAlternative extends Omit<SendMediaGroup, 'media'> {
@@ -98,16 +101,16 @@ export interface SendMediaGroupAlternative extends Omit<SendMediaGroup, 'media'>
 export interface SendPaidMediaAlternative extends Omit<SendPaidMedia, 'media'> {
     media: InputPaidMediaAlternative[];
 }
-export interface SendRepliableMessage<T = unknown> extends SendMessage {
+export interface SendRepliableMessage<T = any> extends SendMessage {
     command?: string;
     data: T;
     from_chat_id?: bigint;
 }
-export interface Start<T = unknown> extends Message {
+export interface Start<T = any> extends Message {
     body: StartBody<T>;
 }
-export interface StartBody<T = unknown> {
+export interface StartBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }

package/index.d.ts

@@ -202,13 +202,13 @@ export declare function banTelegramChatMember(token: string, body: BanChatMember
 
 export declare function banTelegramChatSenderChat(token: string, body: BanChatSenderChat): Promise<boolean | FetchError>;
 
-export declare interface CallbackQuery<T = unknown> extends CallbackQuery_2 {
+export declare interface CallbackQuery<T = any> extends CallbackQuery_2 {
     body: CallbackQueryBody<T>;
 }
 
-export declare interface CallbackQueryBody<T = unknown> {
+export declare interface CallbackQueryBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }
 
@@ -324,36 +324,39 @@ export declare function editTelegramMessageReplyMarkup(token: string, body: Edit
 
 export declare function editTelegramMessageText(token: string, body: EditMessageText): Promise<Message | FetchError>;
 
-export declare function encodeTelegramCallbackQueryBody<T>(data: T, options?: EncodeTelegramCallbackQueryBodyOptions): string;
+export declare function encodeTelegramCallbackQueryBody<T>(options?: EncodeTelegramCallbackQueryBodyOptions<T>): string;
 
-export declare interface EncodeTelegramCallbackQueryBodyOptions {
+export declare interface EncodeTelegramCallbackQueryBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
 
-export declare function encodeTelegramReplyToMessageBody<T>(data: T, options?: EncodeTelegramReplyToMessageBodyOptions): string;
+export declare function encodeTelegramReplyToMessageBody<T>(options?: EncodeTelegramReplyToMessageBodyOptions): string;
 
-export declare interface EncodeTelegramReplyToMessageBodyOptions {
+export declare interface EncodeTelegramReplyToMessageBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
 
-export declare function encodeTelegramReplyToMessageBodyToAnchorTag<T>(data: T, options?: EncodeTelegramReplyToMessageBodyOptions): string;
+export declare function encodeTelegramReplyToMessageBodyToAnchorTag<T>(options?: EncodeTelegramReplyToMessageBodyOptions): string;
 
-export declare function encodeTelegramReplyToMessageBodyToURL<T>(data: T, options?: EncodeTelegramReplyToMessageBodyOptions): string;
+export declare function encodeTelegramReplyToMessageBodyToURL<T>(options?: EncodeTelegramReplyToMessageBodyOptions): string;
 
-export declare function encodeTelegramStartBody<T>(data: T, options?: EncodeTelegramStartBodyOptions): string;
+export declare function encodeTelegramStartBody<T>(options?: EncodeTelegramStartBodyOptions): string;
 
-export declare interface EncodeTelegramStartBodyOptions {
+export declare interface EncodeTelegramStartBodyOptions<T = any> {
     chatID?: bigint | number;
     command?: string;
+    data?: T;
 }
 
-export declare function encodeTelegramStartBodyToAnchorTag<T>(username: string, children: string, data: T, options?: EncodeTelegramStartBodyOptions): string;
+export declare function encodeTelegramStartBodyToAnchorTag<T>(username: string, children: string, options?: EncodeTelegramStartBodyOptions): string;
 
-export declare function encodeTelegramStartBodyToText<T>(data: T, options?: EncodeTelegramStartBodyOptions): string;
+export declare function encodeTelegramStartBodyToText<T>(options?: EncodeTelegramStartBodyOptions): string;
 
-export declare function encodeTelegramStartBodyToURL<T>(username: string, data: T, options?: EncodeTelegramStartBodyOptions): string;
+export declare function encodeTelegramStartBodyToURL<T>(username: string, options?: EncodeTelegramStartBodyOptions): string;
 
 export declare function exportTelegramChatInviteLink(token: string, body: ExportChatInviteLink): Promise<string | FetchError>;
 
@@ -411,7 +414,7 @@ export declare function getTelegramForumTopicIconStickers(token: string): Promis
 
 export declare function getTelegramGameHighScores(token: string, body: GetGameHighScores): Promise<GameHighScore[] | FetchError>;
 
-export declare function getTelegramInlineKeyboardCallbackButton<T>(text: string, data: T, options?: EncodeTelegramCallbackQueryBodyOptions): InlineKeyboardButton;
+export declare function getTelegramInlineKeyboardCallbackButton<T>(text: string, options?: EncodeTelegramCallbackQueryBodyOptions): InlineKeyboardButton;
 
 export declare function getTelegramInlineKeyboardGameButton(text: string, game: string): InlineKeyboardButton;
 
@@ -481,13 +484,13 @@ export declare function reopenTelegramGeneralForumTopic(token: string, body: Reo
 
 export declare function replaceTelegramStickerInSet(token: string, body: ReplaceStickerInSet): Promise<boolean | FetchError>;
 
-export declare interface ReplyToMessage<T = unknown> extends Message {
+export declare interface ReplyToMessage<T = any> extends Message {
     body: ReplyToMessageBody<T>;
 }
 
-export declare interface ReplyToMessageBody<T = unknown> {
+export declare interface ReplyToMessageBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }
 
@@ -505,7 +508,7 @@ declare interface SendPaidMediaAlternative extends Omit<SendPaidMedia, 'media'>
     media: InputPaidMediaAlternative[];
 }
 
-export declare interface SendRepliableMessage<T = unknown> extends SendMessage {
+export declare interface SendRepliableMessage<T = any> extends SendMessage {
     command?: string;
     data: T;
     from_chat_id?: bigint;
@@ -599,13 +602,13 @@ export declare function setTelegramStickerSetTitle(token: string, body: SetStick
 
 export declare function setTelegramWebhook(token: string, body: SetWebhook): Promise<boolean | FetchError>;
 
-export declare interface Start<T = unknown> extends Message {
+export declare interface Start<T = any> extends Message {
     body: StartBody<T>;
 }
 
-export declare interface StartBody<T = unknown> {
+export declare interface StartBody<T = any> {
     c?: bigint | number;
-    d: T;
+    d?: T;
     m?: string;
 }
 

package/package.json

@@ -36,7 +36,7 @@
   },
   "repository": "https://github.com/aracna/telegram-bot",
   "types": "index.d.ts",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "scripts": {
     "build": "rm -rf dist && pnpm tsc && pnpm api-extractor run --local",
     "prepublish": "pnpm test && pnpm build && cp LICENSE package.json README.md dist",

package/requests/send-requests.js

@@ -82,7 +82,7 @@ async function sendRepliableMessage(token, body) {
         parse_mode: 'HTML',
         reply_markup: { force_reply: true, selective: true },
         ...body,
-        text: body.text + (0, reply_to_message_utils_1.encodeReplyToMessageBody)(body.data, { chatID: body.from_chat_id, command: body.command })
+        text: body.text + (0, reply_to_message_utils_1.encodeReplyToMessageBody)({ chatID: body.from_chat_id, command: body.command, data: body.data })
     });
 }
 async function sendSticker(token, body) {

package/utils/callback-query-utils.d.ts

@@ -1,3 +1,3 @@
 import type { CallbackQueryBody, EncodeCallbackQueryBodyOptions } from '../definitions/interfaces';
 export declare function decodeCallbackQueryBody<T>(data?: string): CallbackQueryBody<T>;
-export declare function encodeCallbackQueryBody<T>(data: T, options?: EncodeCallbackQueryBodyOptions): string;
+export declare function encodeCallbackQueryBody<T>(options?: EncodeCallbackQueryBodyOptions<T>): string;

package/utils/callback-query-utils.js

@@ -14,11 +14,11 @@ function decodeCallbackQueryBody(data) {
         return (0, constants_1.DEFAULT_CALLBACK_QUERY_BODY)();
     return body;
 }
-function encodeCallbackQueryBody(data, options) {
+function encodeCallbackQueryBody(options) {
     let body;
     body = {
         c: options?.chatID,
-        d: data,
+        d: options?.data,
         m: options?.command
     };
     return (0, core_1.encodeBase64)((0, core_1.encodeText)((0, core_1.encodeJSON)(body, (0, constants_1.DEFAULT_ENCODE_JSON_OPTIONS)(), '{}')));

package/utils/inline-keyboard-utils.d.ts

@@ -1,6 +1,6 @@
 import type { InlineKeyboardButton, LoginUrl, SwitchInlineQueryChosenChat, WebAppInfo } from '@aracna/telegram-bot-types';
 import { EncodeCallbackQueryBodyOptions } from '../definitions/interfaces';
-export declare function getInlineKeyboardCallbackButton<T>(text: string, data: T, options?: EncodeCallbackQueryBodyOptions): InlineKeyboardButton;
+export declare function getInlineKeyboardCallbackButton<T>(text: string, options?: EncodeCallbackQueryBodyOptions): InlineKeyboardButton;
 export declare function getInlineKeyboardGameButton(text: string, game: string): InlineKeyboardButton;
 export declare function getInlineKeyboardLoginButton(text: string, url: string, fields?: Partial<LoginUrl>): InlineKeyboardButton;
 export declare function getInlineKeyboardPayButton(text: string): InlineKeyboardButton;

package/utils/inline-keyboard-utils.js

@@ -11,8 +11,8 @@ exports.getInlineKeyboardTextButton = getInlineKeyboardTextButton;
 exports.getInlineKeyboardUrlButton = getInlineKeyboardUrlButton;
 exports.getInlineKeyboardWebAppButton = getInlineKeyboardWebAppButton;
 const callback_query_utils_1 = require("./callback-query-utils");
-function getInlineKeyboardCallbackButton(text, data, options) {
-    return { text: text, callback_data: (0, callback_query_utils_1.encodeCallbackQueryBody)(data, options) };
+function getInlineKeyboardCallbackButton(text, options) {
+    return { text: text, callback_data: (0, callback_query_utils_1.encodeCallbackQueryBody)(options) };
 }
 function getInlineKeyboardGameButton(text, game) {
     return { text: text, callback_game: game };

package/utils/reply-to-message-utils.d.ts

@@ -1,6 +1,6 @@
 import type { MessageEntity } from '@aracna/telegram-bot-types';
 import type { EncodeReplyToMessageBodyOptions, ReplyToMessageBody } from '../definitions/interfaces';
 export declare function decodeReplyToMessageBody<T>(entities: MessageEntity[]): ReplyToMessageBody<T>;
-export declare function encodeReplyToMessageBody<T>(data: T, options?: EncodeReplyToMessageBodyOptions): string;
-export declare function encodeReplyToMessageBodyToAnchorTag<T>(data: T, options?: EncodeReplyToMessageBodyOptions): string;
-export declare function encodeReplyToMessageBodyToURL<T>(data: T, options?: EncodeReplyToMessageBodyOptions): string;
+export declare function encodeReplyToMessageBody<T>(options?: EncodeReplyToMessageBodyOptions): string;
+export declare function encodeReplyToMessageBodyToAnchorTag<T>(options?: EncodeReplyToMessageBodyOptions): string;
+export declare function encodeReplyToMessageBodyToURL<T>(options?: EncodeReplyToMessageBodyOptions): string;

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

@@ -19,18 +19,18 @@ function decodeReplyToMessageBody(entities) {
         return (0, constants_1.DEFAULT_REPLY_TO_MESSAGE_BODY)();
     return body;
 }
-function encodeReplyToMessageBody(data, options) {
+function encodeReplyToMessageBody(options) {
     let body;
     body = {
         c: options?.chatID,
-        d: data,
+        d: options?.data,
         m: options?.command
     };
     return (0, core_1.encodeBase64)((0, core_1.encodeText)((0, core_1.encodeJSON)(body, (0, constants_1.DEFAULT_ENCODE_JSON_OPTIONS)(), '{}')));
 }
-function encodeReplyToMessageBodyToAnchorTag(data, options) {
-    return `\n<a href="${encodeReplyToMessageBodyToURL(data, options)}">ㅤ</a>`;
+function encodeReplyToMessageBodyToAnchorTag(options) {
+    return `\n<a href="${encodeReplyToMessageBodyToURL(options)}">ㅤ</a>`;
 }
-function encodeReplyToMessageBodyToURL(data, options) {
-    return (0, core_1.appendSearchParamsToURL)('https://t.me', { a: encodeReplyToMessageBody(data, options) });
+function encodeReplyToMessageBodyToURL(options) {
+    return (0, core_1.appendSearchParamsToURL)('https://t.me', { a: encodeReplyToMessageBody(options) });
 }

package/utils/start-message-utils.d.ts

@@ -1,6 +1,6 @@
 import type { EncodeStartBodyOptions, StartBody } from '../definitions/interfaces';
 export declare function decodeStartBody<T>(text: string | undefined): StartBody<T>;
-export declare function encodeStartBody<T>(data: T, options?: EncodeStartBodyOptions): string;
-export declare function encodeStartBodyToAnchorTag<T>(username: string, children: string, data: T, options?: EncodeStartBodyOptions): string;
-export declare function encodeStartBodyToText<T>(data: T, options?: EncodeStartBodyOptions): string;
-export declare function encodeStartBodyToURL<T>(username: string, data: T, options?: EncodeStartBodyOptions): string;
+export declare function encodeStartBody<T>(options?: EncodeStartBodyOptions): string;
+export declare function encodeStartBodyToAnchorTag<T>(username: string, children: string, options?: EncodeStartBodyOptions): string;
+export declare function encodeStartBodyToText<T>(options?: EncodeStartBodyOptions): string;
+export declare function encodeStartBodyToURL<T>(username: string, options?: EncodeStartBodyOptions): string;

package/utils/start-message-utils.js

@@ -20,21 +20,21 @@ function decodeStartBody(text) {
         return (0, constants_1.DEFAULT_START_MESSAGE_BODY)();
     return body;
 }
-function encodeStartBody(data, options) {
+function encodeStartBody(options) {
     let body;
     body = {
         c: options?.chatID,
-        d: data,
+        d: options?.data,
         m: options?.command
     };
     return (0, core_1.encodeBase64)((0, core_1.encodeText)((0, core_1.encodeJSON)(body, (0, constants_1.DEFAULT_ENCODE_JSON_OPTIONS)(), '{}')));
 }
-function encodeStartBodyToAnchorTag(username, children, data, options) {
-    return `<a href="${encodeStartBodyToURL(username, data, options)}">${children}</a>`;
+function encodeStartBodyToAnchorTag(username, children, options) {
+    return `<a href="${encodeStartBodyToURL(username, options)}">${children}</a>`;
 }
-function encodeStartBodyToText(data, options) {
-    return `/start ${encodeStartBody(data, options)}`;
+function encodeStartBodyToText(options) {
+    return `/start ${encodeStartBody(options)}`;
 }
-function encodeStartBodyToURL(username, data, options) {
-    return (0, core_1.appendSearchParamsToURL)(`https://t.me/${username}`, { start: encodeStartBody(data, options) });
+function encodeStartBodyToURL(username, options) {
+    return (0, core_1.appendSearchParamsToURL)(`https://t.me/${username}`, { start: encodeStartBody(options) });
 }