@mtkruto/node 0.1.132 → 0.1.133

package/esm/3_types.d.ts

@@ -8,6 +8,7 @@ export * from "./types/0_contact.js";
 export * from "./types/0_dice.js";
 export * from "./types/0__file_id.js";
 export * from "./types/0_force_reply.js";
+export * from "./types/0_giveaway_parameters.js";
 export * from "./types/0_input_contact_message_content.js";
 export * from "./types/0_input_location_message_content.js";
 export * from "./types/0_input_venue_message_content.js";
@@ -30,11 +31,13 @@ export * from "./types/1_animation.js";
 export * from "./types/1_bot_command_scope.js";
 export * from "./types/1_chat_p.js";
 export * from "./types/1_document.js";
+export * from "./types/1_giveaway.js";
 export * from "./types/1__getters.js";
 export * from "./types/1_inline_query_result_button.js";
 export * from "./types/1_input_invoice_message_content.js";
 export * from "./types/1_input_text_message_content.js";
 export * from "./types/1_keyboard_button.js";
+export * from "./types/1_message_reaction.js";
 export * from "./types/1_photo.js";
 export * from "./types/1_poll.js";
 export * from "./types/1_reply_quote.js";

package/esm/3_types.js

@@ -8,6 +8,7 @@ export * from "./types/0_contact.js";
 export * from "./types/0_dice.js";
 export * from "./types/0__file_id.js";
 export * from "./types/0_force_reply.js";
+export * from "./types/0_giveaway_parameters.js";
 export * from "./types/0_input_contact_message_content.js";
 export * from "./types/0_input_location_message_content.js";
 export * from "./types/0_input_venue_message_content.js";
@@ -30,11 +31,13 @@ export * from "./types/1_animation.js";
 export * from "./types/1_bot_command_scope.js";
 export * from "./types/1_chat_p.js";
 export * from "./types/1_document.js";
+export * from "./types/1_giveaway.js";
 export * from "./types/1__getters.js";
 export * from "./types/1_inline_query_result_button.js";
 export * from "./types/1_input_invoice_message_content.js";
 export * from "./types/1_input_text_message_content.js";
 export * from "./types/1_keyboard_button.js";
+export * from "./types/1_message_reaction.js";
 export * from "./types/1_photo.js";
 export * from "./types/1_poll.js";
 export * from "./types/1_reply_quote.js";

package/esm/4_constants.d.ts

@@ -3,8 +3,8 @@ export declare const ACK_THRESHOLD = 10;
 export type PublicKeys = readonly [bigint, [bigint, bigint]][];
 export declare const PUBLIC_KEYS: PublicKeys;
 export declare const INITIAL_DC: DC;
-export declare const LAYER = 167;
-export declare const APP_VERSION = "MTKruto 0.1.132";
+export declare const LAYER = 169;
+export declare const APP_VERSION = "MTKruto 0.1.133";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/4_constants.js

@@ -52,8 +52,8 @@ export const PUBLIC_KEYS = Object.freeze([
     ],
 ]);
 export const INITIAL_DC = "2";
-export const LAYER = 167;
-export const APP_VERSION = "MTKruto 0.1.132";
+export const LAYER = 169;
+export const APP_VERSION = "MTKruto 0.1.133";
 // @ts-ignore: lib
 export const DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 export const LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/esm/client/0_utilities.d.ts

@@ -1,8 +1,8 @@
 import { enums, types } from "../2_tl.js";
 export declare const resolve: () => Promise<void>;
 export type With<T, K extends keyof T> = T & Required<Pick<T, K>>;
-export declare function isPtsUpdate(v: enums.Update | enums.Updates): v is types.UpdateShortMessage | types.UpdateShortChatMessage | types.UpdateShortSentMessage | types.UpdateNewMessage | types.UpdateDeleteMessages | types.UpdateReadHistoryInbox | types.UpdateReadHistoryOutbox | types.UpdatePinnedChannelMessages | types.UpdatePinnedMessages | types.UpdateFolderPeers | types.UpdateChannelWebPage | types.UpdateEditMessage | types.UpdateReadMessagesContents | types.UpdateWebPage;
-export declare function isChannelPtsUpdate(v: enums.Update | enums.Updates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages;
+export declare function isPtsUpdate(v: enums.Update): v is types.UpdateNewMessage | types.UpdateDeleteMessages | types.UpdateReadHistoryInbox | types.UpdateReadHistoryOutbox | types.UpdatePinnedChannelMessages | types.UpdatePinnedMessages | types.UpdateFolderPeers | types.UpdateChannelWebPage | types.UpdateEditMessage | types.UpdateReadMessagesContents | types.UpdateWebPage;
+export declare function isChannelPtsUpdate(v: enums.Update | enums.Updates): v is types.UpdateNewChannelMessage | types.UpdateEditChannelMessage | types.UpdateDeleteChannelMessages | types.UpdateChannelTooLong;
 /**
  * Source to a file. Can be a file ID, a file path, URL, or a `Uint8Array`, unless otherwise noted.
  */

package/esm/client/0_utilities.js

@@ -4,10 +4,7 @@ import { UNREACHABLE } from "../1_utilities.js";
 import { types } from "../2_tl.js";
 export const resolve = () => Promise.resolve();
 export function isPtsUpdate(v) {
-    return v instanceof types.UpdateShortMessage ||
-        v instanceof types.UpdateShortChatMessage ||
-        v instanceof types.UpdateShortSentMessage ||
-        v instanceof types.UpdateNewMessage ||
+    return v instanceof types.UpdateNewMessage ||
         v instanceof types.UpdateDeleteMessages ||
         v instanceof types.UpdateReadHistoryInbox ||
         v instanceof types.UpdateReadHistoryOutbox ||
@@ -22,7 +19,8 @@ export function isPtsUpdate(v) {
 export function isChannelPtsUpdate(v) {
     return v instanceof types.UpdateNewChannelMessage ||
         v instanceof types.UpdateEditChannelMessage ||
-        v instanceof types.UpdateDeleteChannelMessages;
+        v instanceof types.UpdateDeleteChannelMessages ||
+        v instanceof types.UpdateChannelTooLong;
 }
 export async function getFileContents(source, fileName = "") {
     fileName = fileName.trim() || "file";

package/esm/client/3_types.d.ts

@@ -1,7 +1,7 @@
 import { FileSource } from "./0_utilities.js";
 import { MaybePromise } from "../1_utilities.js";
 import { functions, types } from "../2_tl.js";
-import { BotCommandScope, CallbackQuery, Chat, ChatID, ChosenInlineResult, ForceReply, InlineKeyboardMarkup, InlineQuery, InlineQueryResultButton, Message, MessageEntity, ReplyKeyboardMarkup, ReplyKeyboardRemove, ReplyQuote } from "../3_types.js";
+import { BotCommandScope, CallbackQuery, Chat, ChatID, ChosenInlineResult, ForceReply, InlineKeyboardMarkup, InlineQuery, InlineQueryResultButton, Message, MessageEntity, MessageReaction, ReplyKeyboardMarkup, ReplyKeyboardRemove, ReplyQuote } from "../3_types.js";
 import { ClientPlainParams } from "./2_client_plain.js";
 import { ParseMode } from "../3_types.js";
 export interface ClientParams extends ClientPlainParams {
@@ -315,7 +315,7 @@ export interface AddReactionParams {
     big?: boolean;
     addToRecents?: boolean;
 }
-export type FilterableUpdates = "message" | "editedMessage" | "callbackQuery" | "inlineQuery" | "chosenInlineResult" | "editedChat" | "newChat";
+export type MessageUpdates = "message" | "editedMessage";
 export interface Update {
     message?: Message;
     editedMessage?: Message;
@@ -330,6 +330,11 @@ export interface Update {
     deletedChat?: {
         chatId: number;
     };
+    reactions?: {
+        chatId: number;
+        messageId: number;
+        reactions: MessageReaction[];
+    };
 }
 export type NextFn<T = void> = () => Promise<T>;
 export interface Handler<C> {
@@ -344,10 +349,10 @@ export interface InvokeErrorHandler<C> {
     }, next: NextFn<boolean>): MaybePromise<boolean>;
 }
 type Update_ = Update;
-export type FilterUpdate<Update extends Update_, Type extends keyof Update_, Field extends string, TypeType extends NonNullable<Update_[Type]> = NonNullable<Update_[Type]>> = Update & {
-    [Type_ in Type]-?: TypeType & {
+export type FilterUpdate<U extends Update_, Type extends keyof Update_, Field extends string, TypeType = NonNullable<Update_[Type]>> = Omit<U, keyof Update_> & Omit<Update_, Type> & {
+    [Type_ in Type]-?: Field extends keyof TypeType ? TypeType & {
         [Field_ in Field]-?: Field extends keyof TypeType ? NonNullable<TypeType[Field]> : never;
-    };
+    } : NonNullable<TypeType>;
 };
 export interface NetworkStatisticsEntry {
     sent: number;

package/esm/client/4_composer.d.ts

@@ -1,5 +1,5 @@
-import { User } from "../3_types.js";
-import { FilterableUpdates, FilterUpdate, Update as Update_ } from "./3_types.js";
+import { MessageTypes, User } from "../3_types.js";
+import { FilterUpdate, MessageUpdates, Update as Update_ } from "./3_types.js";
 interface Update extends Update_ {
     me: undefined extends this["connectionState"] ? undefined extends this["authorizationState"] ? User : (User | undefined) : (User | undefined);
 }
@@ -22,10 +22,10 @@ export declare class Composer<C extends Update> implements MiddlewareObj<C> {
     branch(predicate: (ctx: C) => MaybePromise<boolean>, trueHandler_: Middleware<C>, falseHandler_: Middleware<C>): Composer<C>;
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
-    on<T extends keyof Update_, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
+    on<T extends keyof Update_, F extends string, K extends keyof MessageTypes | null = null>(filter: T extends MessageUpdates ? T | [T, K, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F, K extends keyof MessageTypes ? MessageTypes[K] : C[T]>>[]): Composer<FilterUpdate<C, T, F, K extends keyof MessageTypes ? MessageTypes[K] : C[T]>>;
     command(commands: string | RegExp | (string | RegExp)[] | {
         names: string | RegExp | (string | RegExp)[];
         prefixes: string | string[];
-    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", string, import("../3_types.js").MessageText>>;
 }
 export {};

package/esm/client/4_composer.js

@@ -10,6 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _Composer_handle, _Composer_prefixes;
+import { assertMessageType } from "../3_types.js";
 export function flatten(mw) {
     return typeof mw === "function" ? mw : (ctx, next) => mw.middleware()(ctx, next);
 }
@@ -67,9 +68,19 @@ export class Composer {
     }
     on(filter, ...middleawre) {
         const type = typeof filter === "string" ? filter : filter[0];
-        const keys = Array.isArray(filter) ? filter.slice(1) : [];
+        let keys = Array.isArray(filter) ? filter.slice(1) : [];
+        let messageType = null;
+        if (type == "message") {
+            messageType = keys[0];
+            keys = keys.slice(1);
+        }
         return this.filter((ctx) => {
             if (type in ctx) {
+                if (messageType != null) {
+                    // deno-lint-ignore ban-ts-comment
+                    // @ts-ignore
+                    assertMessageType(ctx[type], messageType);
+                }
                 if (keys.length > 0) {
                     for (const key of keys) {
                         // deno-lint-ignore ban-ts-comment
@@ -84,6 +95,7 @@ export class Composer {
             else {
                 return false;
             }
+            // deno-lint-ignore no-explicit-any
         }, ...middleawre);
     }
     command(commands, ...middleawre) {

package/esm/client/5_client.d.ts

@@ -2,11 +2,11 @@ import { MaybePromise } from "../1_utilities.js";
 import { functions, ReadObject, types } from "../2_tl.js";
 import { Storage } from "../3_storage.js";
 import { DC } from "../3_transport.js";
-import { BotCommand, CallbackQuery, Chat, ChatAction, ChatID, Document, InlineQuery, InlineQueryResult, Message, ParseMode, Reaction, User } from "../3_types.js";
+import { BotCommand, CallbackQuery, Chat, ChatAction, ChatID, Document, InlineQuery, InlineQueryResult, Message, MessageAnimation, MessageAudio, MessageContact, MessageDice, MessageDocument, MessageLocation, MessagePhoto, MessagePoll, MessageText, MessageTypes, MessageVenue, MessageVideo, MessageVideoNote, MessageVoice, ParseMode, Reaction, User } from "../3_types.js";
 import { Migrate } from "../4_errors.js";
 import { FileSource, With } from "./0_utilities.js";
 import { ClientAbstract } from "./1_client_abstract.js";
-import { AddReactionParams, AnswerCallbackQueryParams, AnswerInlineQueryParams, AuthorizeUserParams, ClientParams, DeleteMessageParams, DeleteMessagesParams, DownloadParams, EditMessageParams, FilterableUpdates, FilterUpdate, ForwardMessagesParams, GetChatsParams, GetHistoryParams, GetMyCommandsParams, InvokeErrorHandler, NetworkStatistics, ReplyParams, SendAnimationParams, SendAudioParams, SendContactParams, SendDiceParams, SendDocumentParams, SendLocationParams, SendMessageParams, SendPhotoParams, SendPollParams, SendVenueParams, SendVideoNoteParams, SendVideoParams, SendVoiceParams, SetMyCommandsParams, Update, UploadParams } from "./3_types.js";
+import { AddReactionParams, AnswerCallbackQueryParams, AnswerInlineQueryParams, AuthorizeUserParams, ClientParams, DeleteMessageParams, DeleteMessagesParams, DownloadParams, EditMessageParams, FilterUpdate, ForwardMessagesParams, GetChatsParams, GetHistoryParams, GetMyCommandsParams, InvokeErrorHandler, MessageUpdates, NetworkStatistics, ReplyParams, SendAnimationParams, SendAudioParams, SendContactParams, SendDiceParams, SendDocumentParams, SendLocationParams, SendMessageParams, SendPhotoParams, SendPollParams, SendVenueParams, SendVideoNoteParams, SendVideoParams, SendVoiceParams, SetMyCommandsParams, Update, UploadParams } from "./3_types.js";
 import { Composer, Middleware } from "./4_composer.js";
 declare const getEntity: unique symbol;
 declare const getStickerSetName: unique symbol;
@@ -38,31 +38,31 @@ export interface Context extends Update {
     /** Resolves to `effectiveMessage?.senderChat`. */
     senderChat: this["msg"] extends never ? never : this["msg"]["senderChat"];
     /** Reply the received message with a text message. */
-    reply: (text: string, params?: Omit<SendMessageParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "text">>;
+    reply: (text: string, params?: Omit<SendMessageParams, "replyToMessageId"> & ReplyParams) => Promise<MessageText>;
     /** Reply the received message with a poll. */
-    replyPoll: (question: string, options: [string, string, ...string[]], params?: Omit<SendPollParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "poll">>;
+    replyPoll: (question: string, options: [string, string, ...string[]], params?: Omit<SendPollParams, "replyToMessageId"> & ReplyParams) => Promise<MessagePoll>;
     /** Reply the received message with a photo. */
-    replyPhoto: (photo: FileSource, params?: Omit<SendPhotoParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "photo">>;
+    replyPhoto: (photo: FileSource, params?: Omit<SendPhotoParams, "replyToMessageId"> & ReplyParams) => Promise<MessagePhoto>;
     /** Reply the received message with a document. */
-    replyDocument: (document: FileSource, params?: Omit<SendDocumentParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "document">>;
+    replyDocument: (document: FileSource, params?: Omit<SendDocumentParams, "replyToMessageId"> & ReplyParams) => Promise<MessageDocument>;
     /** Reply the received message with a location. */
-    replyLocation: (latitude: number, longitude: number, params?: Omit<SendLocationParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "location">>;
+    replyLocation: (latitude: number, longitude: number, params?: Omit<SendLocationParams, "replyToMessageId"> & ReplyParams) => Promise<MessageLocation>;
     /** Reply the received message with a dice. */
-    replyDice: (params?: Omit<SendDiceParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "dice">>;
+    replyDice: (params?: Omit<SendDiceParams, "replyToMessageId"> & ReplyParams) => Promise<MessageDice>;
     /** Reply the received message with a venue. */
-    replyVenue: (latitude: number, longitude: number, title: string, address: string, params?: Omit<SendVenueParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "venue">>;
+    replyVenue: (latitude: number, longitude: number, title: string, address: string, params?: Omit<SendVenueParams, "replyToMessageId"> & ReplyParams) => Promise<MessageVenue>;
     /** Reply the received message with a contact. */
-    replyContact: (firstName: string, number: string, params?: Omit<SendContactParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "contact">>;
+    replyContact: (firstName: string, number: string, params?: Omit<SendContactParams, "replyToMessageId"> & ReplyParams) => Promise<MessageContact>;
     /** Reply the received message with a video. */
-    replyVideo: (video: FileSource, params?: Omit<SendVideoParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "video">>;
+    replyVideo: (video: FileSource, params?: Omit<SendVideoParams, "replyToMessageId"> & ReplyParams) => Promise<MessageVideo>;
     /** Reply the received message with an animation. */
-    replyAnimation: (animation: FileSource, params?: Omit<SendAnimationParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "animation">>;
+    replyAnimation: (animation: FileSource, params?: Omit<SendAnimationParams, "replyToMessageId"> & ReplyParams) => Promise<MessageAnimation>;
     /** Reply the received message with a voice message. */
-    replyVoice: (voice: FileSource, params?: Omit<SendVoiceParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "voice">>;
+    replyVoice: (voice: FileSource, params?: Omit<SendVoiceParams, "replyToMessageId"> & ReplyParams) => Promise<MessageVoice>;
     /** Reply the received message with an audio file. */
-    replyAudio: (audio: FileSource, params?: Omit<SendAudioParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "audio">>;
+    replyAudio: (audio: FileSource, params?: Omit<SendAudioParams, "replyToMessageId"> & ReplyParams) => Promise<MessageAudio>;
     /** Reply the received message with a video note. */
-    replyVideoNote: (videoNote: FileSource, params?: Omit<SendVideoNoteParams, "replyToMessageId"> & ReplyParams) => Promise<With<Message, "videoNote">>;
+    replyVideoNote: (videoNote: FileSource, params?: Omit<SendVideoNoteParams, "replyToMessageId"> & ReplyParams) => Promise<MessageVideoNote>;
     /** Delete the received message. */
     delete: () => Promise<void>;
     /** Forward the received message. */
@@ -72,15 +72,15 @@ export interface Context extends Update {
         messageThreadId?: number;
     }) => Promise<void>;
     /** Edit a message in the chat which the message was received from. */
-    editMessageText: (messageId: number, text: string, params?: EditMessageParams) => Promise<With<Message, "text">>;
+    editMessageText: (messageId: number, text: string, params?: EditMessageParams) => Promise<MessageText>;
     /** Answer the received callback query. */
     answerCallbackQuery: (params?: AnswerCallbackQueryParams) => Promise<void>;
     /** Answer the received inline query. */
     answerInlineQuery: (results: InlineQueryResult[], params?: AnswerInlineQueryParams) => Promise<void>;
     /** Retrieve a single message of the chat which the message was received from. */
-    getMessage: (messageId: number) => Promise<Omit<Message, "replyToMessage"> | null>;
+    getMessage: (messageId: number) => Promise<Message | null>;
     /** Retrieve multiple messages of the chat which the message was received from. */
-    getMessages: (messageIds: number[]) => Promise<Omit<Message, "replyToMessage">[]>;
+    getMessages: (messageIds: number[]) => Promise<Message[]>;
     /** Forward a message of the chat which the message was received from. */
     forwardMessage: (to: ChatID, messageId: number, params?: ForwardMessagesParams) => Promise<Message>;
     /** Forward multiple messages of the chat which the message was received from. */
@@ -189,7 +189,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param text The message's text.
      * @returns The sent text message.
      */
-    sendMessage(chatId: ChatID, text: string, params?: SendMessageParams): Promise<With<Message, "text">>;
+    sendMessage(chatId: ChatID, text: string, params?: SendMessageParams): Promise<MessageText>;
     /**
      * Edit a message's text.
      *
@@ -199,7 +199,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param text The new text of the message.
      * @returns The edited text message.
      */
-    editMessageText(chatId: ChatID, messageId: number, text: string, params?: EditMessageParams): Promise<With<Message, "text">>;
+    editMessageText(chatId: ChatID, messageId: number, text: string, params?: EditMessageParams): Promise<MessageText>;
     /**
      * Retrieve multiple messages.
      *
@@ -211,7 +211,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * ```
      * @returns The retrieved messages.
      */
-    getMessages(chatId: ChatID, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    getMessages(chatId: ChatID, messageIds: number[]): Promise<Message[]>;
     private [getMessageWithReply];
     /**
      * Retrieve a single message.
@@ -224,7 +224,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * ```
      * @returns The retrieved message.
      */
-    getMessage(chatId: ChatID, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
+    getMessage(chatId: ChatID, messageId: number): Promise<Message | null>;
     /**
      * Download a file.
      *
@@ -281,7 +281,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param options The poll's options.
      * @returns The sent poll.
      */
-    sendPoll(chatId: ChatID, question: string, options: [string, string, ...string[]], params?: SendPollParams): Promise<With<Message, "poll">>;
+    sendPoll(chatId: ChatID, question: string, options: [string, string, ...string[]], params?: SendPollParams): Promise<MessagePoll>;
     /**
      * Send a chat action.
      *
@@ -323,11 +323,11 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     branch(predicate: (ctx: C) => MaybePromise<boolean>, trueHandler_: Middleware<C>, falseHandler_: Middleware<C>): Composer<C>;
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
-    on<T extends keyof Update, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
+    on<T extends keyof Update, F extends string, K extends keyof MessageTypes | null = null>(filter: T extends MessageUpdates ? T | [T, K, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F, K extends keyof MessageTypes ? MessageTypes[K] : C[T]>>[]): Composer<FilterUpdate<C, T, F, K extends keyof MessageTypes ? MessageTypes[K] : C[T]>>;
     command(commands: string | RegExp | (string | RegExp)[] | {
         names: string | RegExp | (string | RegExp)[];
         prefixes: string | string[];
-    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", string, MessageText>>;
     /**
      * Set the bot's description in the given language. Bot-only.
      *
@@ -402,7 +402,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the photo to.
      * @param photo The photo to send.
      */
-    sendPhoto(chatId: ChatID, photo: FileSource, params?: SendPhotoParams): Promise<With<Message, "photo">>;
+    sendPhoto(chatId: ChatID, photo: FileSource, params?: SendPhotoParams): Promise<MessagePhoto>;
     /**
      * Send a document.
      *
@@ -410,7 +410,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the document to.
      * @param document The document to send.
      */
-    sendDocument(chatId: ChatID, document: FileSource, params?: SendDocumentParams): Promise<With<Message, "document">>;
+    sendDocument(chatId: ChatID, document: FileSource, params?: SendDocumentParams): Promise<MessageDocument>;
     /**
      * Send a video.
      *
@@ -418,7 +418,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the video to.
      * @param video The video to send.
      */
-    sendVideo(chatId: ChatID, video: FileSource, params?: SendVideoParams): Promise<With<Message, "video">>;
+    sendVideo(chatId: ChatID, video: FileSource, params?: SendVideoParams): Promise<MessageVideo>;
     /**
      * Send an animation.
      *
@@ -426,7 +426,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the animation to.
      * @param animation The animation to send.
      */
-    sendAnimation(chatId: ChatID, animation: FileSource, params?: SendAnimationParams): Promise<With<Message, "animation">>;
+    sendAnimation(chatId: ChatID, animation: FileSource, params?: SendAnimationParams): Promise<MessageAnimation>;
     /**
      * Send a voice message.
      *
@@ -434,7 +434,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the voice message to.
      * @param voice The voice to send.
      */
-    sendVoice(chatId: ChatID, voice: FileSource, params?: SendVoiceParams): Promise<With<Message, "voice">>;
+    sendVoice(chatId: ChatID, voice: FileSource, params?: SendVoiceParams): Promise<MessageVoice>;
     /**
      * Send an audio file.
      *
@@ -442,7 +442,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the audio file to.
      * @param audio The audio to send.
      */
-    sendAudio(chatId: ChatID, audio: FileSource, params?: SendAudioParams): Promise<With<Message, "audio">>;
+    sendAudio(chatId: ChatID, audio: FileSource, params?: SendAudioParams): Promise<MessageAudio>;
     /**
      * Send a video note.
      *
@@ -450,7 +450,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param chatId The chat to send the video note to.
      * @param videoNote The video note to send.
      */
-    sendVideoNote(chatId: ChatID, audio: FileSource, params?: SendVideoNoteParams): Promise<With<Message, "videoNote">>;
+    sendVideoNote(chatId: ChatID, audio: FileSource, params?: SendVideoNoteParams): Promise<MessageVideoNote>;
     /**
      * Send a location.
      *
@@ -459,7 +459,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param latitude The location's latitude.
      * @param longitude The location's longitude.
      */
-    sendLocation(chatId: ChatID, latitude: number, longitude: number, params?: SendLocationParams): Promise<With<Message, "location">>;
+    sendLocation(chatId: ChatID, latitude: number, longitude: number, params?: SendLocationParams): Promise<MessageLocation>;
     /**
      * Send a contact.
      *
@@ -468,14 +468,14 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param firstName The contact's first name.
      * @param number The contact's phone number.
      */
-    sendContact(chatId: ChatID, firstName: string, number: string, params?: SendContactParams): Promise<With<Message, "contact">>;
+    sendContact(chatId: ChatID, firstName: string, number: string, params?: SendContactParams): Promise<MessageContact>;
     /**
      * Send a dice.
      *
      * @method
      * @param chatId The chat to send the dice to.
      */
-    sendDice(chatId: ChatID, params?: SendDiceParams): Promise<With<Message, "dice">>;
+    sendDice(chatId: ChatID, params?: SendDiceParams): Promise<MessageDice>;
     /**
      * Send a venue.
      *
@@ -486,7 +486,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * @param title The title of the venue.
      * @param address The written address of the venue.
      */
-    sendVenue(chatId: ChatID, latitude: number, longitude: number, title: string, address: string, params?: SendVenueParams): Promise<With<Message, "dice">>;
+    sendVenue(chatId: ChatID, latitude: number, longitude: number, title: string, address: string, params?: SendVenueParams): Promise<MessageVenue>;
     /**
      * Get network statistics. This might not always be available.
      *