@mtkruto/node 0.1.115 → 0.1.117

package/esm/4_constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 166;
-export declare const APP_VERSION = "MTKruto 0.1.115";
+export declare const APP_VERSION = "MTKruto 0.1.117";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/4_constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2";
 export const LAYER = 166;
-export const APP_VERSION = "MTKruto 0.1.115";
+export const APP_VERSION = "MTKruto 0.1.117";
 // @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

@@ -9,3 +9,4 @@ export declare function isChannelPtsUpdate(v: types.TypeUpdate | types.TypeUpdat
 export type FileSource = string | URL | Uint8Array;
 export declare function getFileContents(source: FileSource, fileName?: string): Promise<readonly [Uint8Array, string]>;
 export declare function isHttpUrl(string: string): boolean;
+export declare function getUsername(string: string): string;

package/esm/client/0_utilities.js

@@ -2,6 +2,7 @@ import * as dntShim from "../_dnt.shims.js";
 import { path } from "../0_deps.js";
 import { UNREACHABLE } from "../1_utilities.js";
 import { types } from "../2_tl.js";
+import { Username } from "../tl/2_types.js";
 export const resolve = () => Promise.resolve();
 export function isPtsUpdate(v) {
     return v instanceof types.UpdateShortMessage ||
@@ -74,3 +75,66 @@ export function isHttpUrl(string) {
         return false;
     }
 }
+function isAlpha(string) {
+    const c = string.charCodeAt(0) | 0x20;
+    return "a".charCodeAt(0) <= c && c <= "z".charCodeAt(0);
+}
+function isDigit(string) {
+    const c = string.charCodeAt(0);
+    return "0".charCodeAt(0) <= c && c <= "9".charCodeAt(0);
+}
+const errInvalidUsername = (u) => new Error("Invalid username: " + u);
+function validateUsername(string, ignoreAt = false) {
+    string = string.trim();
+    if (ignoreAt && string.startsWith("@")) {
+        string = string.slice(1);
+    }
+    if (string.length == 0 || string.length > 32) {
+        throw errInvalidUsername(string);
+    }
+    if (!isAlpha(string[0])) {
+        throw errInvalidUsername(string);
+    }
+    for (const c of string) {
+        if (!isAlpha(c) && !isDigit(c) && c != "_") {
+            throw errInvalidUsername(string);
+        }
+    }
+    if (string[Username.length - 1] == "_") {
+        throw errInvalidUsername(string);
+    }
+    for (let i = 1; i < string.length; ++i) {
+        if (string[i - 1] == "_" && string[i] == "_") {
+            throw errInvalidUsername(string);
+        }
+    }
+    return string;
+}
+export function getUsername(string) {
+    let url = null;
+    try {
+        url = new URL(string);
+    }
+    catch {
+        try {
+            url = new URL("https://" + string);
+        }
+        catch {
+            //
+        }
+    }
+    if (url === null || (url.protocol != "http:" && url.protocol != "https:")) {
+        return validateUsername(string, true);
+    }
+    if (url.hostname != "telegram.dog" && url.hostname != "telegram.me" && url.hostname != "t.me" && !url.hostname.endsWith(".t.me")) {
+        return validateUsername(string, true);
+    }
+    if (url.hostname == "telegram.dog" || url.hostname == "telegram.me" || url.hostname == "t.me") {
+        return validateUsername(url.pathname.split("/")[1]);
+    }
+    const parts = url.hostname.split(".");
+    if (parts.length != 3) {
+        return validateUsername(string);
+    }
+    return validateUsername(parts[0]);
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,7 +1,6 @@
 import { MaybePromise } from "../1_utilities.js";
 import { functions, types } from "../2_tl.js";
 import { BotCommandScope, CallbackQuery, ChatID, ForceReply, InlineKeyboardMarkup, InlineQuery, InlineQueryResultButton, Message, MessageEntity, ReplyKeyboardMarkup, ReplyKeyboardRemove } from "../3_types.js";
-import { With } from "./0_utilities.js";
 import { ClientPlainParams } from "./2_client_plain.js";
 import { ParseMode } from "../3_types.js";
 export interface ClientParams extends ClientPlainParams {
@@ -314,6 +313,10 @@ export interface InvokeErrorHandler<C> {
         n: number;
     }, next: NextFn<boolean>): MaybePromise<boolean>;
 }
-export type FilterUpdate<U extends Update, T extends keyof U, F extends (keyof NonNullable<U[T]>) | null> = With<U, T> & Pick<{
-    [P in T]-?: F extends keyof NonNullable<U[T]> ? With<NonNullable<U[T]>, F> : NonNullable<U[T]>;
-}, T>;
+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 & {
+        [Field_ in Field]-?: Field extends keyof TypeType ? NonNullable<TypeType[Field]> : never;
+    };
+};
+export {};

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

@@ -1,4 +1,8 @@
-import { FilterableUpdates, FilterUpdate, Update } from "./3_types.js";
+import { User } from "../3_types.js";
+import { FilterableUpdates, FilterUpdate, 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);
+}
 type MaybePromise<T> = T | Promise<T>;
 export type NextFunction = () => Promise<void>;
 export type MiddlewareFn<C extends Update = Update> = (ctx: C, next: NextFunction) => MaybePromise<unknown>;
@@ -17,6 +21,7 @@ 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 keyof NonNullable<Update[T]>>(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>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
+    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
 }
 export {};

package/esm/client/4_composer.js

@@ -54,7 +54,9 @@ export class Composer {
         });
     }
     filter(predicate, ...middleware) {
-        return this.branch(predicate, middleware.length == 0 ? skip : middleware.map(flatten).reduce(concat), skip);
+        const composer = new Composer(...middleware);
+        this.branch(predicate, composer, skip);
+        return composer;
     }
     on(filter, ...middleawre) {
         const type = typeof filter === "string" ? filter : filter[0];
@@ -77,5 +79,31 @@ export class Composer {
             }
         }, ...middleawre);
     }
+    command(commands, ...middleawre) {
+        const commands_ = Array.isArray(commands) ? commands : [commands];
+        return this.on(["message", "text"]).filter((ctx) => {
+            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
+            if (!botCommand) {
+                return false;
+            }
+            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
+            if (cmd.includes("@")) {
+                const username = cmd.split("@")[1];
+                if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
+                    return false;
+                }
+            }
+            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            for (const command of commands_) {
+                if (typeof command === "string" && (command.toLowerCase() == command_)) {
+                    return true;
+                }
+                else if (command instanceof RegExp && command.test(command_)) {
+                    return true;
+                }
+            }
+            return false;
+        }, ...middleawre);
+    }
 }
 _Composer_handle = new WeakMap();

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

@@ -15,6 +15,7 @@ declare const getMessageWithReply: unique symbol;
 export interface Context extends Update {
     /** The client that received the update. */
     client: Client;
+    me: undefined extends this["connectionState"] ? undefined extends this["authorizationState"] ? User : (User | undefined) : (User | undefined);
     /** Resolves to `ctx.message ?? ctx.editedMessage ?? ctx.callbackQuery?.message`. */
     msg: undefined extends this["message"] ? undefined extends this["editedMessage"] ? undefined extends this["callbackQuery"] ? never : this["callbackQuery"] extends With<CallbackQuery, "message"> ? this["callbackQuery"]["message"] : this["callbackQuery"] extends With<CallbackQuery, "inlineMessageId"> ? never : (Message | undefined) : this["editedMessage"] : this["message"];
     /** Resolves to `effectiveMessage?.chat`. */
@@ -282,9 +283,10 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     answerInlineQuery(id: string, results: InlineQueryResult[], params?: AnswerInlineQueryParams): Promise<void>;
     use(...middleware: Middleware<C>[]): Composer<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>[]): void;
-    filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): void;
-    on<T extends keyof Update, F extends keyof NonNullable<Update[T]>>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): void;
+    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>>;
+    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
     /**
      * Set the bot's description in the given language. Bot-only.
      *

package/esm/client/5_client.js

@@ -9,9 +9,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
+var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
 import { debug, gunzip, Mutex } from "../0_deps.js";
-import { bigIntFromBuffer, drop, getRandomBigInt, getRandomId, mod, mustPrompt, mustPromptOneOf, Queue, sha1, UNREACHABLE } from "../1_utilities.js";
+import { bigIntFromBuffer, cleanObject, drop, getRandomBigInt, getRandomId, mod, mustPrompt, mustPromptOneOf, Queue, sha1, UNREACHABLE } from "../1_utilities.js";
 import { as, functions, getChannelChatId, Message_, MessageContainer, peerToChatId, RPCResult, TLError, TLReader, types } from "../2_tl.js";
 import { StorageMemory } from "../3_storage.js";
 import { botCommandScopeToTlObject, constructCallbackQuery, constructInlineQuery, constructMessage, constructUser, FileID, FileType, inlineQueryResultToTlObject, messageEntityToTlObject, replyMarkupToTlObject, ThumbnailSource } from "../3_types.js";
@@ -20,7 +20,7 @@ import { AuthKeyUnregistered, FloodWait, Migrate, PasswordHashInvalid, PhoneNumb
 import { parseHtml } from "./0_html.js";
 import { decryptMessage, encryptMessage, getMessageId } from "./0_message.js";
 import { checkPassword } from "./0_password.js";
-import { getFileContents, isChannelPtsUpdate, isHttpUrl, isPtsUpdate, resolve } from "./0_utilities.js";
+import { getFileContents, getUsername, isChannelPtsUpdate, isHttpUrl, isPtsUpdate, resolve } from "./0_utilities.js";
 import { ClientAbstract } from "./1_client_abstract.js";
 import { ClientPlain } from "./2_client_plain.js";
 import { Composer, concat, flatten, skip } from "./4_composer.js";
@@ -120,7 +120,7 @@ export class Client extends ClientAbstract {
         _Client_publicKeys.set(this, void 0);
         _Client_autoStart.set(this, void 0);
         _Client_ignoreOutgoing.set(this, void 0);
-        _Client_constructContext.set(this, (update) => {
+        _Client_constructContext.set(this, async (update) => {
             const msg = update.message ?? update.editedMessage ?? update.callbackQuery?.message;
             const mustGetMsg = () => {
                 if (msg !== undefined) {
@@ -138,9 +138,11 @@ export class Client extends ClientAbstract {
                 const replyToMessageId = shouldQuote ? effectiveMessage.id : undefined;
                 return replyToMessageId;
             };
-            return {
+            const me = update.connectionState !== undefined ? __classPrivateFieldGet(this, _Client_lastGetMe, "f") : (update.authorizationState !== undefined && !update.authorizationState.authorized) ? __classPrivateFieldGet(this, _Client_lastGetMe, "f") : await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getMe).call(this);
+            return cleanObject({
                 ...update,
                 client: this,
+                me: me == null ? undefined : me,
                 msg,
                 chat,
                 from,
@@ -217,7 +219,7 @@ export class Client extends ClientAbstract {
                 get toJSON() {
                     return () => update;
                 },
-            };
+            });
         });
         _Client_lastPropagatedConnectionState.set(this, null);
         Object.defineProperty(this, "stateChangeHandler", {
@@ -277,6 +279,7 @@ export class Client extends ClientAbstract {
         });
         _Client_handleUpdateQueue.set(this, new Queue("handleUpdate"));
         _Client_processUpdatesQueue.set(this, new Queue("processUpdates"));
+        _Client_lastGetMe.set(this, null);
         _Client_usernameResolver.set(this, async (v) => {
             const inputPeer = await this.getInputPeer(v).then((v) => v[as](types.InputPeerUser));
             return new types.InputUser({ userId: inputPeer.userId, accessHash: inputPeer.accessHash });
@@ -403,9 +406,9 @@ export class Client extends ClientAbstract {
             release();
         }
     }
-    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
+    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
         __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), resolve);
         });
     }, _Client_setAuth = async function _Client_setAuth(key) {
         const hash = await sha1(key);
@@ -684,7 +687,7 @@ export class Client extends ClientAbstract {
         }
     }, _Client_propagateAuthorizationState = async function _Client_propagateAuthorizationState(authorized) {
         if (__classPrivateFieldGet(this, _Client_lastPropagatedAuthorizationState, "f") != authorized) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { authorizationState: { authorized } }), resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { authorizationState: { authorized } }), resolve);
             __classPrivateFieldSet(this, _Client_lastPropagatedAuthorizationState, authorized, "f");
         }
     }, _Client_getSelfId = async function _Client_getSelfId() {
@@ -1157,52 +1160,44 @@ export class Client extends ClientAbstract {
         return channels.chats[0][as](types.Channel).accessHash ?? 0n;
     }, _Client_getInputPeerInner = async function _Client_getInputPeerInner(id) {
         if (typeof id === "string") {
-            if (!id.startsWith("@")) {
-                throw new Error("Expected username to start with @");
-            }
-            else {
-                id = id.slice(1);
-                if (!id) {
-                    throw new Error("Empty username");
-                }
-                let userId = 0n;
-                let channelId = 0n;
-                const maybeUsername = await this.storage.getUsername(id);
-                if (maybeUsername != null && Date.now() - maybeUsername[2].getTime() < USERNAME_TTL) {
-                    const [type, id] = maybeUsername;
-                    if (type == "user") {
-                        userId = id;
-                    }
-                    else {
-                        channelId = id;
-                    }
+            id = getUsername(id);
+            let userId = 0n;
+            let channelId = 0n;
+            const maybeUsername = await this.storage.getUsername(id);
+            if (maybeUsername != null && Date.now() - maybeUsername[2].getTime() < USERNAME_TTL) {
+                const [type, id] = maybeUsername;
+                if (type == "user") {
+                    userId = id;
                 }
                 else {
-                    const resolved = await this.invoke(new functions.ContactsResolveUsername({ username: id }));
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, resolved.chats);
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, resolved.users);
-                    if (resolved.peer instanceof types.PeerUser) {
-                        userId = resolved.peer.userId;
-                    }
-                    else if (resolved.peer instanceof types.PeerChannel) {
-                        channelId = resolved.peer.channelId;
-                    }
-                    else {
-                        UNREACHABLE();
-                    }
+                    channelId = id;
                 }
-                if (userId) {
-                    const accessHash = await this.storage.getUserAccessHash(userId);
-                    return new types.InputPeerUser({ userId, accessHash: accessHash ?? 0n });
+            }
+            else {
+                const resolved = await this.invoke(new functions.ContactsResolveUsername({ username: id }));
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, resolved.chats);
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, resolved.users);
+                if (resolved.peer instanceof types.PeerUser) {
+                    userId = resolved.peer.userId;
                 }
-                else if (channelId) {
-                    const accessHash = await this.storage.getChannelAccessHash(channelId);
-                    return new types.InputPeerChannel({ channelId, accessHash: accessHash ?? 0n });
+                else if (resolved.peer instanceof types.PeerChannel) {
+                    channelId = resolved.peer.channelId;
                 }
                 else {
                     UNREACHABLE();
                 }
             }
+            if (userId) {
+                const accessHash = await this.storage.getUserAccessHash(userId);
+                return new types.InputPeerUser({ userId, accessHash: accessHash ?? 0n });
+            }
+            else if (channelId) {
+                const accessHash = await this.storage.getChannelAccessHash(channelId);
+                return new types.InputPeerChannel({ channelId, accessHash: accessHash ?? 0n });
+            }
+            else {
+                UNREACHABLE();
+            }
         }
         else if (id > 0) {
             const id_ = BigInt(id);
@@ -1585,7 +1580,9 @@ export class Client extends ClientAbstract {
         if (users.length < 1) {
             UNREACHABLE();
         }
-        return constructUser(users[0][as](types.User));
+        const user = constructUser(users[0][as](types.User));
+        __classPrivateFieldSet(this, _Client_lastGetMe, user, "f");
+        return user;
     }
     /**
      * Answer a callback query. Bot-only.
@@ -1856,7 +1853,9 @@ export class Client extends ClientAbstract {
         });
     }
     filter(predicate, ...middleware) {
-        return this.branch(predicate, middleware.length == 0 ? skip : middleware.map(flatten).reduce(concat), skip);
+        const composer = new Composer(...middleware);
+        this.branch(predicate, composer, skip);
+        return composer;
     }
     on(filter, ...middleawre) {
         const type = typeof filter === "string" ? filter : filter[0];
@@ -1879,6 +1878,32 @@ export class Client extends ClientAbstract {
             }
         }, ...middleawre);
     }
+    command(commands, ...middleawre) {
+        const commands_ = Array.isArray(commands) ? commands : [commands];
+        return this.on(["message", "text"]).filter((ctx) => {
+            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
+            if (!botCommand) {
+                return false;
+            }
+            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
+            if (cmd.includes("@")) {
+                const username = cmd.split("@")[1];
+                if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
+                    return false;
+                }
+            }
+            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            for (const command of commands_) {
+                if (typeof command === "string" && (command.toLowerCase() == command_)) {
+                    return true;
+                }
+                else if (command instanceof RegExp && command.test(command_)) {
+                    return true;
+                }
+            }
+            return false;
+        }, ...middleawre);
+    }
     /**
      * Set the bot's description in the given language. Bot-only.
      *
@@ -2032,7 +2057,16 @@ export class Client extends ClientAbstract {
         return __classPrivateFieldGet(Client, _a, "m", _Client_assertMsgHas).call(Client, message, "photo");
     }
 }
-_a = Client, _Client_handleUpdate = 
+_a = Client, _Client_getMe = async function _Client_getMe() {
+    if (__classPrivateFieldGet(this, _Client_lastGetMe, "f") != null) {
+        return __classPrivateFieldGet(this, _Client_lastGetMe, "f");
+    }
+    else {
+        const user = await this.getMe();
+        __classPrivateFieldSet(this, _Client_lastGetMe, user, "f");
+        return user;
+    }
+}, _Client_handleUpdate = 
 // TODO: log errors
 async function _Client_handleUpdate(update) {
     if (update instanceof types.UpdateShortMessage) {
@@ -2097,7 +2131,7 @@ async function _Client_handleUpdate(update) {
             }
             if (!shouldIgnore) {
                 const message = await constructMessage(update.message, this[getEntity].bind(this), this.getMessage.bind(this), this[getStickerSetName].bind(this));
-                await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { [key]: message }), resolve);
+                await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { [key]: message }), resolve);
             }
         }
     }
@@ -2114,7 +2148,7 @@ async function _Client_handleUpdate(update) {
             }
         }
         if (deletedMessages.length > 0) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), resolve);
         }
     }
     else if (update instanceof types.UpdateDeleteChannelMessages) {
@@ -2128,14 +2162,14 @@ async function _Client_handleUpdate(update) {
             await this.storage.setMessage(chatId, messageId, null);
         }
         if (deletedMessages.length > 0) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), resolve);
         }
     }
     if (update instanceof types.UpdateBotCallbackQuery || update instanceof types.UpdateInlineBotCallbackQuery) {
-        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { callbackQuery: await constructCallbackQuery(update, this[getEntity].bind(this), this[getMessageWithReply].bind(this)) }), resolve);
+        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { callbackQuery: await constructCallbackQuery(update, this[getEntity].bind(this), this[getMessageWithReply].bind(this)) }), resolve);
     }
     else if (update instanceof types.UpdateBotInlineQuery) {
-        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { inlineQuery: await constructInlineQuery(update, this[getEntity].bind(this)) }), resolve);
+        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { inlineQuery: await constructInlineQuery(update, this[getEntity].bind(this)) }), resolve);
     }
 }, _Client_constructReplyMarkup = async function _Client_constructReplyMarkup(params) {
     if (params?.replyMarkup) {

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.1.115",
+  "version": "0.1.117",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/4_constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 166;
-export declare const APP_VERSION = "MTKruto 0.1.115";
+export declare const APP_VERSION = "MTKruto 0.1.117";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/4_constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2";
 exports.LAYER = 166;
-exports.APP_VERSION = "MTKruto 0.1.115";
+exports.APP_VERSION = "MTKruto 0.1.117";
 // @ts-ignore: lib
 exports.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;
 exports.LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

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

@@ -9,3 +9,4 @@ export declare function isChannelPtsUpdate(v: types.TypeUpdate | types.TypeUpdat
 export type FileSource = string | URL | Uint8Array;
 export declare function getFileContents(source: FileSource, fileName?: string): Promise<readonly [Uint8Array, string]>;
 export declare function isHttpUrl(string: string): boolean;
+export declare function getUsername(string: string): string;

package/script/client/0_utilities.js

@@ -23,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHttpUrl = exports.getFileContents = exports.isChannelPtsUpdate = exports.isPtsUpdate = exports.resolve = void 0;
+exports.getUsername = exports.isHttpUrl = exports.getFileContents = exports.isChannelPtsUpdate = exports.isPtsUpdate = exports.resolve = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const _0_deps_js_1 = require("../0_deps.js");
 const _1_utilities_js_1 = require("../1_utilities.js");
 const _2_tl_js_1 = require("../2_tl.js");
+const _2_types_js_1 = require("../tl/2_types.js");
 const resolve = () => Promise.resolve();
 exports.resolve = resolve;
 function isPtsUpdate(v) {
@@ -105,3 +106,67 @@ function isHttpUrl(string) {
     }
 }
 exports.isHttpUrl = isHttpUrl;
+function isAlpha(string) {
+    const c = string.charCodeAt(0) | 0x20;
+    return "a".charCodeAt(0) <= c && c <= "z".charCodeAt(0);
+}
+function isDigit(string) {
+    const c = string.charCodeAt(0);
+    return "0".charCodeAt(0) <= c && c <= "9".charCodeAt(0);
+}
+const errInvalidUsername = (u) => new Error("Invalid username: " + u);
+function validateUsername(string, ignoreAt = false) {
+    string = string.trim();
+    if (ignoreAt && string.startsWith("@")) {
+        string = string.slice(1);
+    }
+    if (string.length == 0 || string.length > 32) {
+        throw errInvalidUsername(string);
+    }
+    if (!isAlpha(string[0])) {
+        throw errInvalidUsername(string);
+    }
+    for (const c of string) {
+        if (!isAlpha(c) && !isDigit(c) && c != "_") {
+            throw errInvalidUsername(string);
+        }
+    }
+    if (string[_2_types_js_1.Username.length - 1] == "_") {
+        throw errInvalidUsername(string);
+    }
+    for (let i = 1; i < string.length; ++i) {
+        if (string[i - 1] == "_" && string[i] == "_") {
+            throw errInvalidUsername(string);
+        }
+    }
+    return string;
+}
+function getUsername(string) {
+    let url = null;
+    try {
+        url = new URL(string);
+    }
+    catch {
+        try {
+            url = new URL("https://" + string);
+        }
+        catch {
+            //
+        }
+    }
+    if (url === null || (url.protocol != "http:" && url.protocol != "https:")) {
+        return validateUsername(string, true);
+    }
+    if (url.hostname != "telegram.dog" && url.hostname != "telegram.me" && url.hostname != "t.me" && !url.hostname.endsWith(".t.me")) {
+        return validateUsername(string, true);
+    }
+    if (url.hostname == "telegram.dog" || url.hostname == "telegram.me" || url.hostname == "t.me") {
+        return validateUsername(url.pathname.split("/")[1]);
+    }
+    const parts = url.hostname.split(".");
+    if (parts.length != 3) {
+        return validateUsername(string);
+    }
+    return validateUsername(parts[0]);
+}
+exports.getUsername = getUsername;

package/script/client/0_utilities_test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,7 +1,6 @@
 import { MaybePromise } from "../1_utilities.js";
 import { functions, types } from "../2_tl.js";
 import { BotCommandScope, CallbackQuery, ChatID, ForceReply, InlineKeyboardMarkup, InlineQuery, InlineQueryResultButton, Message, MessageEntity, ReplyKeyboardMarkup, ReplyKeyboardRemove } from "../3_types.js";
-import { With } from "./0_utilities.js";
 import { ClientPlainParams } from "./2_client_plain.js";
 import { ParseMode } from "../3_types.js";
 export interface ClientParams extends ClientPlainParams {
@@ -314,6 +313,10 @@ export interface InvokeErrorHandler<C> {
         n: number;
     }, next: NextFn<boolean>): MaybePromise<boolean>;
 }
-export type FilterUpdate<U extends Update, T extends keyof U, F extends (keyof NonNullable<U[T]>) | null> = With<U, T> & Pick<{
-    [P in T]-?: F extends keyof NonNullable<U[T]> ? With<NonNullable<U[T]>, F> : NonNullable<U[T]>;
-}, T>;
+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 & {
+        [Field_ in Field]-?: Field extends keyof TypeType ? NonNullable<TypeType[Field]> : never;
+    };
+};
+export {};

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

@@ -1,4 +1,8 @@
-import { FilterableUpdates, FilterUpdate, Update } from "./3_types.js";
+import { User } from "../3_types.js";
+import { FilterableUpdates, FilterUpdate, 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);
+}
 type MaybePromise<T> = T | Promise<T>;
 export type NextFunction = () => Promise<void>;
 export type MiddlewareFn<C extends Update = Update> = (ctx: C, next: NextFunction) => MaybePromise<unknown>;
@@ -17,6 +21,7 @@ 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 keyof NonNullable<Update[T]>>(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>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
+    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
 }
 export {};

package/script/client/4_composer.js

@@ -60,7 +60,9 @@ class Composer {
         });
     }
     filter(predicate, ...middleware) {
-        return this.branch(predicate, middleware.length == 0 ? exports.skip : middleware.map(flatten).reduce(concat), exports.skip);
+        const composer = new Composer(...middleware);
+        this.branch(predicate, composer, exports.skip);
+        return composer;
     }
     on(filter, ...middleawre) {
         const type = typeof filter === "string" ? filter : filter[0];
@@ -83,6 +85,32 @@ class Composer {
             }
         }, ...middleawre);
     }
+    command(commands, ...middleawre) {
+        const commands_ = Array.isArray(commands) ? commands : [commands];
+        return this.on(["message", "text"]).filter((ctx) => {
+            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
+            if (!botCommand) {
+                return false;
+            }
+            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
+            if (cmd.includes("@")) {
+                const username = cmd.split("@")[1];
+                if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
+                    return false;
+                }
+            }
+            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            for (const command of commands_) {
+                if (typeof command === "string" && (command.toLowerCase() == command_)) {
+                    return true;
+                }
+                else if (command instanceof RegExp && command.test(command_)) {
+                    return true;
+                }
+            }
+            return false;
+        }, ...middleawre);
+    }
 }
 exports.Composer = Composer;
 _Composer_handle = new WeakMap();

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

@@ -15,6 +15,7 @@ declare const getMessageWithReply: unique symbol;
 export interface Context extends Update {
     /** The client that received the update. */
     client: Client;
+    me: undefined extends this["connectionState"] ? undefined extends this["authorizationState"] ? User : (User | undefined) : (User | undefined);
     /** Resolves to `ctx.message ?? ctx.editedMessage ?? ctx.callbackQuery?.message`. */
     msg: undefined extends this["message"] ? undefined extends this["editedMessage"] ? undefined extends this["callbackQuery"] ? never : this["callbackQuery"] extends With<CallbackQuery, "message"> ? this["callbackQuery"]["message"] : this["callbackQuery"] extends With<CallbackQuery, "inlineMessageId"> ? never : (Message | undefined) : this["editedMessage"] : this["message"];
     /** Resolves to `effectiveMessage?.chat`. */
@@ -282,9 +283,10 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     answerInlineQuery(id: string, results: InlineQueryResult[], params?: AnswerInlineQueryParams): Promise<void>;
     use(...middleware: Middleware<C>[]): Composer<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>[]): void;
-    filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): void;
-    on<T extends keyof Update, F extends keyof NonNullable<Update[T]>>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): void;
+    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>>;
+    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
     /**
      * Set the bot's description in the given language. Bot-only.
      *

package/script/client/5_client.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
+var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = exports.ConnectionError = exports.restartAuth = exports.skipInvoke = exports.handleMigrationError = void 0;
 const _0_deps_js_1 = require("../0_deps.js");
@@ -125,7 +125,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         _Client_publicKeys.set(this, void 0);
         _Client_autoStart.set(this, void 0);
         _Client_ignoreOutgoing.set(this, void 0);
-        _Client_constructContext.set(this, (update) => {
+        _Client_constructContext.set(this, async (update) => {
             const msg = update.message ?? update.editedMessage ?? update.callbackQuery?.message;
             const mustGetMsg = () => {
                 if (msg !== undefined) {
@@ -143,9 +143,11 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 const replyToMessageId = shouldQuote ? effectiveMessage.id : undefined;
                 return replyToMessageId;
             };
-            return {
+            const me = update.connectionState !== undefined ? __classPrivateFieldGet(this, _Client_lastGetMe, "f") : (update.authorizationState !== undefined && !update.authorizationState.authorized) ? __classPrivateFieldGet(this, _Client_lastGetMe, "f") : await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getMe).call(this);
+            return (0, _1_utilities_js_1.cleanObject)({
                 ...update,
                 client: this,
+                me: me == null ? undefined : me,
                 msg,
                 chat,
                 from,
@@ -222,7 +224,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 get toJSON() {
                     return () => update;
                 },
-            };
+            });
         });
         _Client_lastPropagatedConnectionState.set(this, null);
         Object.defineProperty(this, "stateChangeHandler", {
@@ -282,6 +284,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         });
         _Client_handleUpdateQueue.set(this, new _1_utilities_js_1.Queue("handleUpdate"));
         _Client_processUpdatesQueue.set(this, new _1_utilities_js_1.Queue("processUpdates"));
+        _Client_lastGetMe.set(this, null);
         _Client_usernameResolver.set(this, async (v) => {
             const inputPeer = await this.getInputPeer(v).then((v) => v[_2_tl_js_1.as](_2_tl_js_1.types.InputPeerUser));
             return new _2_tl_js_1.types.InputUser({ userId: inputPeer.userId, accessHash: inputPeer.accessHash });
@@ -408,9 +411,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             release();
         }
     }
-    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
+    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
         __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), _0_utilities_js_1.resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), _0_utilities_js_1.resolve);
         });
     }, _Client_setAuth = async function _Client_setAuth(key) {
         const hash = await (0, _1_utilities_js_1.sha1)(key);
@@ -689,7 +692,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
     }, _Client_propagateAuthorizationState = async function _Client_propagateAuthorizationState(authorized) {
         if (__classPrivateFieldGet(this, _Client_lastPropagatedAuthorizationState, "f") != authorized) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { authorizationState: { authorized } }), _0_utilities_js_1.resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { authorizationState: { authorized } }), _0_utilities_js_1.resolve);
             __classPrivateFieldSet(this, _Client_lastPropagatedAuthorizationState, authorized, "f");
         }
     }, _Client_getSelfId = async function _Client_getSelfId() {
@@ -1162,52 +1165,44 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         return channels.chats[0][_2_tl_js_1.as](_2_tl_js_1.types.Channel).accessHash ?? 0n;
     }, _Client_getInputPeerInner = async function _Client_getInputPeerInner(id) {
         if (typeof id === "string") {
-            if (!id.startsWith("@")) {
-                throw new Error("Expected username to start with @");
-            }
-            else {
-                id = id.slice(1);
-                if (!id) {
-                    throw new Error("Empty username");
-                }
-                let userId = 0n;
-                let channelId = 0n;
-                const maybeUsername = await this.storage.getUsername(id);
-                if (maybeUsername != null && Date.now() - maybeUsername[2].getTime() < _4_constants_js_1.USERNAME_TTL) {
-                    const [type, id] = maybeUsername;
-                    if (type == "user") {
-                        userId = id;
-                    }
-                    else {
-                        channelId = id;
-                    }
+            id = (0, _0_utilities_js_1.getUsername)(id);
+            let userId = 0n;
+            let channelId = 0n;
+            const maybeUsername = await this.storage.getUsername(id);
+            if (maybeUsername != null && Date.now() - maybeUsername[2].getTime() < _4_constants_js_1.USERNAME_TTL) {
+                const [type, id] = maybeUsername;
+                if (type == "user") {
+                    userId = id;
                 }
                 else {
-                    const resolved = await this.invoke(new _2_tl_js_1.functions.ContactsResolveUsername({ username: id }));
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, resolved.chats);
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, resolved.users);
-                    if (resolved.peer instanceof _2_tl_js_1.types.PeerUser) {
-                        userId = resolved.peer.userId;
-                    }
-                    else if (resolved.peer instanceof _2_tl_js_1.types.PeerChannel) {
-                        channelId = resolved.peer.channelId;
-                    }
-                    else {
-                        (0, _1_utilities_js_1.UNREACHABLE)();
-                    }
+                    channelId = id;
                 }
-                if (userId) {
-                    const accessHash = await this.storage.getUserAccessHash(userId);
-                    return new _2_tl_js_1.types.InputPeerUser({ userId, accessHash: accessHash ?? 0n });
+            }
+            else {
+                const resolved = await this.invoke(new _2_tl_js_1.functions.ContactsResolveUsername({ username: id }));
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, resolved.chats);
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, resolved.users);
+                if (resolved.peer instanceof _2_tl_js_1.types.PeerUser) {
+                    userId = resolved.peer.userId;
                 }
-                else if (channelId) {
-                    const accessHash = await this.storage.getChannelAccessHash(channelId);
-                    return new _2_tl_js_1.types.InputPeerChannel({ channelId, accessHash: accessHash ?? 0n });
+                else if (resolved.peer instanceof _2_tl_js_1.types.PeerChannel) {
+                    channelId = resolved.peer.channelId;
                 }
                 else {
                     (0, _1_utilities_js_1.UNREACHABLE)();
                 }
             }
+            if (userId) {
+                const accessHash = await this.storage.getUserAccessHash(userId);
+                return new _2_tl_js_1.types.InputPeerUser({ userId, accessHash: accessHash ?? 0n });
+            }
+            else if (channelId) {
+                const accessHash = await this.storage.getChannelAccessHash(channelId);
+                return new _2_tl_js_1.types.InputPeerChannel({ channelId, accessHash: accessHash ?? 0n });
+            }
+            else {
+                (0, _1_utilities_js_1.UNREACHABLE)();
+            }
         }
         else if (id > 0) {
             const id_ = BigInt(id);
@@ -1590,7 +1585,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         if (users.length < 1) {
             (0, _1_utilities_js_1.UNREACHABLE)();
         }
-        return (0, _3_types_js_1.constructUser)(users[0][_2_tl_js_1.as](_2_tl_js_1.types.User));
+        const user = (0, _3_types_js_1.constructUser)(users[0][_2_tl_js_1.as](_2_tl_js_1.types.User));
+        __classPrivateFieldSet(this, _Client_lastGetMe, user, "f");
+        return user;
     }
     /**
      * Answer a callback query. Bot-only.
@@ -1861,7 +1858,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         });
     }
     filter(predicate, ...middleware) {
-        return this.branch(predicate, middleware.length == 0 ? _4_composer_js_1.skip : middleware.map(_4_composer_js_1.flatten).reduce(_4_composer_js_1.concat), _4_composer_js_1.skip);
+        const composer = new _4_composer_js_1.Composer(...middleware);
+        this.branch(predicate, composer, _4_composer_js_1.skip);
+        return composer;
     }
     on(filter, ...middleawre) {
         const type = typeof filter === "string" ? filter : filter[0];
@@ -1884,6 +1883,32 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             }
         }, ...middleawre);
     }
+    command(commands, ...middleawre) {
+        const commands_ = Array.isArray(commands) ? commands : [commands];
+        return this.on(["message", "text"]).filter((ctx) => {
+            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
+            if (!botCommand) {
+                return false;
+            }
+            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
+            if (cmd.includes("@")) {
+                const username = cmd.split("@")[1];
+                if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
+                    return false;
+                }
+            }
+            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            for (const command of commands_) {
+                if (typeof command === "string" && (command.toLowerCase() == command_)) {
+                    return true;
+                }
+                else if (command instanceof RegExp && command.test(command_)) {
+                    return true;
+                }
+            }
+            return false;
+        }, ...middleawre);
+    }
     /**
      * Set the bot's description in the given language. Bot-only.
      *
@@ -2038,7 +2063,16 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
     }
 }
 exports.Client = Client;
-_a = Client, _Client_handleUpdate = 
+_a = Client, _Client_getMe = async function _Client_getMe() {
+    if (__classPrivateFieldGet(this, _Client_lastGetMe, "f") != null) {
+        return __classPrivateFieldGet(this, _Client_lastGetMe, "f");
+    }
+    else {
+        const user = await this.getMe();
+        __classPrivateFieldSet(this, _Client_lastGetMe, user, "f");
+        return user;
+    }
+}, _Client_handleUpdate = 
 // TODO: log errors
 async function _Client_handleUpdate(update) {
     if (update instanceof _2_tl_js_1.types.UpdateShortMessage) {
@@ -2103,7 +2137,7 @@ async function _Client_handleUpdate(update) {
             }
             if (!shouldIgnore) {
                 const message = await (0, _3_types_js_1.constructMessage)(update.message, this[getEntity].bind(this), this.getMessage.bind(this), this[getStickerSetName].bind(this));
-                await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { [key]: message }), _0_utilities_js_1.resolve);
+                await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { [key]: message }), _0_utilities_js_1.resolve);
             }
         }
     }
@@ -2120,7 +2154,7 @@ async function _Client_handleUpdate(update) {
             }
         }
         if (deletedMessages.length > 0) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), _0_utilities_js_1.resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), _0_utilities_js_1.resolve);
         }
     }
     else if (update instanceof _2_tl_js_1.types.UpdateDeleteChannelMessages) {
@@ -2134,14 +2168,14 @@ async function _Client_handleUpdate(update) {
             await this.storage.setMessage(chatId, messageId, null);
         }
         if (deletedMessages.length > 0) {
-            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), _0_utilities_js_1.resolve);
+            await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { deletedMessages: deletedMessages }), _0_utilities_js_1.resolve);
         }
     }
     if (update instanceof _2_tl_js_1.types.UpdateBotCallbackQuery || update instanceof _2_tl_js_1.types.UpdateInlineBotCallbackQuery) {
-        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { callbackQuery: await (0, _3_types_js_1.constructCallbackQuery)(update, this[getEntity].bind(this), this[getMessageWithReply].bind(this)) }), _0_utilities_js_1.resolve);
+        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { callbackQuery: await (0, _3_types_js_1.constructCallbackQuery)(update, this[getEntity].bind(this), this[getMessageWithReply].bind(this)) }), _0_utilities_js_1.resolve);
     }
     else if (update instanceof _2_tl_js_1.types.UpdateBotInlineQuery) {
-        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { inlineQuery: await (0, _3_types_js_1.constructInlineQuery)(update, this[getEntity].bind(this)) }), _0_utilities_js_1.resolve);
+        await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { inlineQuery: await (0, _3_types_js_1.constructInlineQuery)(update, this[getEntity].bind(this)) }), _0_utilities_js_1.resolve);
     }
 }, _Client_constructReplyMarkup = async function _Client_constructReplyMarkup(params) {
     if (params?.replyMarkup) {