@mtkruto/node 0.1.114 → 0.1.116

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`. */
@@ -135,7 +136,7 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
      * Alias for `invoke` with its second parameter being `true`.
      */
     send<T extends (functions.Function<unknown> | types.Type) = functions.Function<unknown>>(function_: T): Promise<void>;
-    checkGap(pts: number, ptsCount: number, assertNoGap: boolean): Promise<void>;
+    checkGap(pts: number, ptsCount: number): Promise<void>;
     getUserAccessHash(userId: bigint): Promise<bigint>;
     getInputPeer(id: ChatID): Promise<types.InputPeerChat | types.InputPeerUser | types.InputPeerChannel>;
     private [getEntity];
@@ -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 keyof NonNullable<Update[T]>>(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_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");
@@ -124,7 +124,8 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         });
         _Client_publicKeys.set(this, void 0);
         _Client_autoStart.set(this, void 0);
-        _Client_constructContext.set(this, (update) => {
+        _Client_ignoreOutgoing.set(this, void 0);
+        _Client_constructContext.set(this, async (update) => {
             const msg = update.message ?? update.editedMessage ?? update.callbackQuery?.message;
             const mustGetMsg = () => {
                 if (msg !== undefined) {
@@ -142,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,
@@ -221,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", {
@@ -281,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 });
@@ -297,6 +301,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         this.systemVersion = params?.systemVersion ?? _4_constants_js_1.SYSTEM_VERSION;
         __classPrivateFieldSet(this, _Client_publicKeys, params?.publicKeys, "f");
         __classPrivateFieldSet(this, _Client_autoStart, params?.autoStart ?? true, "f");
+        __classPrivateFieldSet(this, _Client_ignoreOutgoing, params?.ignoreOutgoing ?? null, "f");
         if (params?.defaultHandlers ?? true) {
             this.on("connectionState", ({ connectionState }, next) => {
                 (0, _1_utilities_js_1.drop)((async () => {
@@ -406,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_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);
@@ -644,24 +649,19 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
     send(function_) {
         return this.invoke(function_, true);
     }
-    async checkGap(pts, ptsCount, assertNoGap) {
+    async checkGap(pts, ptsCount) {
         const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
         if (localState.pts + ptsCount < pts) {
-            if (assertNoGap) {
-                (0, _1_utilities_js_1.UNREACHABLE)();
-            }
-            else {
-                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverUpdateGap).call(this, "processUpdates");
-            }
+            await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverUpdateGap).call(this, "processUpdates");
         }
     }
     async getUserAccessHash(userId) {
         const users = await this.invoke(new _2_tl_js_1.functions.UsersGetUsers({ id: [new _2_tl_js_1.types.InputUser({ userId, accessHash: 0n })] }));
-        return users[0][_2_tl_js_1.as](_2_tl_js_1.types.User).accessHash ?? 0n;
+        return users[0]?.[_2_tl_js_1.as](_2_tl_js_1.types.User).accessHash ?? 0n;
     }
     async getInputPeer(id) {
         const inputPeer = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getInputPeerInner).call(this, id);
-        if (inputPeer instanceof _2_tl_js_1.types.InputPeerUser || inputPeer instanceof _2_tl_js_1.types.InputPeerChannel && inputPeer.accessHash == 0n && await this.storage.getAccountType() == "bot") {
+        if ((inputPeer instanceof _2_tl_js_1.types.InputPeerUser || inputPeer instanceof _2_tl_js_1.types.InputPeerChannel && inputPeer.accessHash == 0n) && await this.storage.getAccountType() == "bot") {
             if ("channelId" in inputPeer) {
                 inputPeer.accessHash = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getChannelAccessHash).call(this, inputPeer.channelId);
             }
@@ -692,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() {
@@ -728,7 +728,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     }
                     dRecv("received %s", body.constructor.name);
                     if (body instanceof _2_tl_js_1.types._TypeUpdates || body instanceof _2_tl_js_1.types._TypeUpdate) {
-                        __classPrivateFieldGet(this, _Client_processUpdatesQueue, "f").add(() => __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, body));
+                        __classPrivateFieldGet(this, _Client_processUpdatesQueue, "f").add(() => __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, body, true));
                     }
                     else if (body instanceof _2_tl_js_1.types.NewSessionCreated) {
                         __classPrivateFieldGet(this, _Client_state, "f").salt = body.serverSalt;
@@ -760,7 +760,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                         };
                         if (result instanceof _2_tl_js_1.types._TypeUpdates || result instanceof _2_tl_js_1.types._TypeUpdate) {
                             __classPrivateFieldGet(this, _Client_processUpdatesQueue, "f").add(async () => {
-                                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, result);
+                                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, result, true);
                                 resolvePromise();
                             });
                         }
@@ -916,20 +916,15 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }
             }
         }
-    }, _Client_checkChannelGap = async function _Client_checkChannelGap(channelId, pts, ptsCount, assertNoGap) {
+    }, _Client_checkChannelGap = async function _Client_checkChannelGap(channelId, pts, ptsCount) {
         let localPts = await this.storage.getChannelPts(channelId);
         if (!localPts) {
             localPts = pts - ptsCount;
         }
         if (localPts + ptsCount < pts) {
-            if (assertNoGap) {
-                (0, _1_utilities_js_1.UNREACHABLE)();
-            }
-            else {
-                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverChannelUpdateGap).call(this, channelId, "processUpdates");
-            }
+            await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverChannelUpdateGap).call(this, channelId, "processUpdates");
         }
-    }, _Client_processUpdates = async function _Client_processUpdates(updates_, assertNoGap = false) {
+    }, _Client_processUpdates = async function _Client_processUpdates(updates_, checkGap) {
         /// First, individual updates (Update[1]) and updateShort* are extracted from Updates.[2]
         ///
         /// If an updatesTooLong[3] was received, an update gap recovery is initiated and no further action will be taken.
@@ -971,7 +966,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 if (update.pts == 0) {
                     continue;
                 }
-                await this.checkGap(update.pts, update.ptsCount, assertNoGap);
+                if (checkGap) {
+                    await this.checkGap(update.pts, update.ptsCount);
+                }
                 localState ??= await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
                 originalPts ??= localState.pts;
                 if (localState.pts + update.ptsCount > update.pts) {
@@ -987,7 +984,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }
                 const ptsCount = update.ptsCount;
                 const channelId = update instanceof _2_tl_js_1.types.UpdateNewChannelMessage || update instanceof _2_tl_js_1.types.UpdateEditChannelMessage ? update.message.peerId[_2_tl_js_1.as](_2_tl_js_1.types.PeerChannel).channelId : update.channelId;
-                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_checkChannelGap).call(this, channelId, update.pts, ptsCount, assertNoGap);
+                if (checkGap) {
+                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_checkChannelGap).call(this, channelId, update.pts, ptsCount);
+                }
                 let currentPts = channelPtsMap.get(channelId);
                 if (currentPts === undefined) {
                     currentPts = await this.storage.getChannelPts(channelId);
@@ -1001,14 +1000,6 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }
             }
         }
-        if (!assertNoGap) {
-            if (localState != null && originalPts != null && localState.pts != originalPts) {
-                await this.storage.setState(localState);
-            }
-            for (const [channelId, pts] of channelPtsMap.entries()) {
-                await this.storage.setChannelPts(channelId, pts);
-            }
-        }
         /// We process the updates when we are sure there is no gap.
         if (updates_ instanceof _2_tl_js_1.types.Updates || updates_ instanceof _2_tl_js_1.types.UpdatesCombined) {
             await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, updates_.chats);
@@ -1087,10 +1078,10 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, difference.chats);
                     await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, difference.users);
                     for (const message of difference.newMessages) {
-                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewMessage({ message, pts: 0, ptsCount: 0 }), true);
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewMessage({ message, pts: 0, ptsCount: 0 }), false);
                     }
                     for (const update of difference.otherUpdates) {
-                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, update, true);
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, update, false);
                     }
                     if (difference instanceof _2_tl_js_1.types.UpdatesDifference) {
                         await this.storage.setState(difference.state);
@@ -1138,10 +1129,10 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, difference.chats);
                 await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, difference.users);
                 for (const message of difference.newMessages) {
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewChannelMessage({ message, pts: 0, ptsCount: 0 }), true);
+                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewChannelMessage({ message, pts: 0, ptsCount: 0 }), false);
                 }
                 for (const update of difference.otherUpdates) {
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, update, true);
+                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, update, false);
                 }
                 await this.storage.setChannelPts(channelId, difference.pts);
                 dGapC("recovered from update gap [%o, %s]", channelId, source);
@@ -1153,7 +1144,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processChats).call(this, difference.chats);
                 await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUsers).call(this, difference.users);
                 for (const message of difference.messages) {
-                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewChannelMessage({ message, pts: 0, ptsCount: 0 }), true);
+                    await __classPrivateFieldGet(this, _Client_instances, "m", _Client_processUpdates).call(this, new _2_tl_js_1.types.UpdateNewChannelMessage({ message, pts: 0, ptsCount: 0 }), false);
                 }
                 const pts_ = difference.dialog[_2_tl_js_1.as](_2_tl_js_1.types.Dialog).pts;
                 if (pts_ != undefined) {
@@ -1174,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);
@@ -1602,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.
@@ -1873,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];
@@ -1896,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.
      *
@@ -2050,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) {
@@ -2108,8 +2130,15 @@ async function _Client_handleUpdate(update) {
         update instanceof _2_tl_js_1.types.UpdateEditChannelMessage) {
         const key = update instanceof _2_tl_js_1.types.UpdateNewMessage || update instanceof _2_tl_js_1.types.UpdateNewChannelMessage ? "message" : "editedMessage";
         if (!(update.message instanceof _2_tl_js_1.types.MessageEmpty)) {
-            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);
+            const isOutgoing = update.message.out;
+            let shouldIgnore = isOutgoing ? (await this.storage.getAccountType()) == "user" ? false : true : false;
+            if (__classPrivateFieldGet(this, _Client_ignoreOutgoing, "f") != null && isOutgoing) {
+                shouldIgnore = __classPrivateFieldGet(this, _Client_ignoreOutgoing, "f");
+            }
+            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, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { [key]: message }), _0_utilities_js_1.resolve);
+            }
         }
     }
     if (update instanceof _2_tl_js_1.types.UpdateDeleteMessages) {
@@ -2125,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) {
@@ -2139,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) {