@mtkruto/node 0.1.157 → 0.1.160

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

@@ -21,10 +21,10 @@ export declare class Composer<C extends {
     branch(predicate: (ctx: UpdateIntersection<C>) => MaybePromise<boolean>, trueHandler_: Middleware<UpdateIntersection<C>>, falseHandler_: Middleware<UpdateIntersection<C>>): Composer<C>;
     filter<D extends C>(predicate: (ctx: UpdateIntersection<C>) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: UpdateIntersection<C>) => MaybePromise<boolean>, ...middleware: Middleware<UpdateIntersection<C>>[]): Composer<C>;
-    on<Q extends FilterQuery>(filter: Q, ...middleawre: Middleware<WithFilter<C, Q>>[]): Composer<UpdateIntersection<WithFilter<C, Q>>>;
+    on<Q extends FilterQuery>(filter: Q, ...middleware: Middleware<WithFilter<C, Q>>[]): Composer<UpdateIntersection<WithFilter<C, Q>>>;
     command(commands: string | RegExp | (string | RegExp)[] | {
         names: string | RegExp | (string | RegExp)[];
         prefixes: string | string[];
-    }, ...middleawre: Middleware<WithFilter<C, "message:text">>[]): Composer<WithFilter<C, "message:text">>;
+    }, ...middleware: Middleware<WithFilter<C, "message:text">>[]): Composer<WithFilter<C, "message:text">>;
 }
 export {};

package/script/client/1_composer.js

@@ -74,12 +74,12 @@ class Composer {
         this.branch(predicate, composer, skip);
         return composer;
     }
-    on(filter, ...middleawre) {
+    on(filter, ...middleware) {
         return this.filter((ctx) => {
             return (0, _0_filters_js_1.match)(filter, ctx);
-        }, ...middleawre);
+        }, ...middleware);
     }
-    command(commands, ...middleawre) {
+    command(commands, ...middleware) {
         const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
         const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
         const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Composer_prefixes, "f") ?? []);
@@ -120,7 +120,7 @@ class Composer {
                 }
             }
             return false;
-        }, ...middleawre);
+        }, ...middleware);
     }
 }
 exports.Composer = Composer;

package/script/client/1_file_manager.js

@@ -102,55 +102,48 @@ class FileManager {
         }
     }
     async *download(fileId, params) {
-        const fileId_ = _3_types_js_1.FileID.decode(fileId);
-        switch (fileId_.fileType) {
-            case _3_types_js_1.FileType.ChatPhoto: {
-                const big = fileId_.params.thumbnailSource == _3_types_js_1.ThumbnailSource.ChatPhotoBig;
-                const peer = await __classPrivateFieldGet(this, _FileManager_c, "f").getInputPeer(fileId_.params.chatId);
-                const location = new _2_tl_js_1.types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photo_id: fileId_.params.mediaId });
-                for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
-                    yield chunk;
-                }
-                break;
-            }
-            case _3_types_js_1.FileType.Photo: {
-                if (fileId_.params.mediaId == undefined || fileId_.params.accessHash == undefined || fileId_.params.fileReference == undefined || fileId_.params.thumbnailSize == undefined) {
-                    (0, _1_utilities_js_1.UNREACHABLE)();
+        const fileId_ = (0, _3_types_js_1.deserializeFileId)(fileId);
+        if (fileId_.location.type == "photo") {
+            switch (fileId_.type) {
+                case _3_types_js_1.FileType.ProfilePhoto: {
+                    if (fileId_.location.source.type != _3_types_js_1.PhotoSourceType.ChatPhotoBig && fileId_.location.source.type != _3_types_js_1.PhotoSourceType.ChatPhotoSmall) {
+                        (0, _1_utilities_js_1.UNREACHABLE)();
+                    }
+                    const big = fileId_.location.source.type == _3_types_js_1.PhotoSourceType.ChatPhotoBig;
+                    const peer = await __classPrivateFieldGet(this, _FileManager_c, "f").getInputPeer(Number(fileId_.location.source.chatId)); // TODO: use access hash from source?
+                    const location = new _2_tl_js_1.types.InputPeerPhotoFileLocation({ big: big ? true : undefined, peer, photo_id: fileId_.location.id });
+                    for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
+                        yield chunk;
+                    }
+                    break;
                 }
-                const location = new _2_tl_js_1.types.InputPhotoFileLocation({
-                    id: fileId_.params.mediaId,
-                    access_hash: fileId_.params.accessHash,
-                    file_reference: fileId_.params.fileReference,
-                    thumb_size: fileId_.params.thumbnailSize,
-                });
-                for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
-                    yield chunk;
+                case _3_types_js_1.FileType.Photo: {
+                    const location = new _2_tl_js_1.types.InputPhotoFileLocation({
+                        id: fileId_.location.id,
+                        access_hash: fileId_.location.accessHash,
+                        file_reference: fileId_.fileReference ?? new Uint8Array(),
+                        thumb_size: "thumbnailType" in fileId_.location.source ? String.fromCharCode(fileId_.location.source.thumbnailType) : "",
+                    });
+                    for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
+                        yield chunk;
+                    }
+                    break;
                 }
-                break;
             }
-            case _3_types_js_1.FileType.Document:
-            case _3_types_js_1.FileType.Sticker:
-            case _3_types_js_1.FileType.VideoNote:
-            case _3_types_js_1.FileType.Video:
-            case _3_types_js_1.FileType.Audio:
-            case _3_types_js_1.FileType.Voice:
-            case _3_types_js_1.FileType.Animation: {
-                if (fileId_.params.mediaId == undefined || fileId_.params.accessHash == undefined || fileId_.params.fileReference == undefined || fileId_.params.thumbnailSize == undefined) {
-                    (0, _1_utilities_js_1.UNREACHABLE)();
-                }
-                const location = new _2_tl_js_1.types.InputDocumentFileLocation({
-                    id: fileId_.params.mediaId,
-                    access_hash: fileId_.params.accessHash,
-                    file_reference: fileId_.params.fileReference,
-                    thumb_size: fileId_.params.thumbnailSize,
-                });
-                for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
-                    yield chunk;
-                }
-                break;
+        }
+        else if (fileId_.location.type == "common") {
+            const location = new _2_tl_js_1.types.InputDocumentFileLocation({
+                id: fileId_.location.id,
+                access_hash: fileId_.location.accessHash,
+                file_reference: fileId_.fileReference ?? new Uint8Array(),
+                thumb_size: "", // TODO?
+            });
+            for await (const chunk of __classPrivateFieldGet(this, _FileManager_instances, "m", _FileManager_downloadInner).call(this, location, fileId_.dcId, params)) {
+                yield chunk;
             }
-            default:
-                (0, _1_utilities_js_1.UNREACHABLE)();
+        }
+        else {
+            (0, _1_utilities_js_1.UNREACHABLE)();
         }
     }
     async getCustomEmojiDocuments(id) {
@@ -164,12 +157,14 @@ class FileManager {
             const maybeDocument = await __classPrivateFieldGet(this, _FileManager_c, "f").messageStorage.getCustomEmojiDocument(BigInt(id_));
             if (maybeDocument != null && Date.now() - maybeDocument[1].getTime() <= 30 * 60 * 1000) {
                 const document_ = maybeDocument[0];
-                const fileUniqueId = new _3_types_js_1.FileUniqueID(_3_types_js_1.FileUniqueType.Document, { mediaId: document_.id }).encode();
-                const fileId = new _3_types_js_1.FileID(null, null, _3_types_js_1.FileType.Document, document_.dc_id, {
-                    mediaId: document_.id,
-                    accessHash: document_.access_hash,
+                const fileId_ = {
+                    type: _3_types_js_1.FileType.Document,
+                    dcId: document_.dc_id,
                     fileReference: document_.file_reference,
-                }).encode();
+                    location: { type: "common", id: document_.id, accessHash: document_.access_hash },
+                };
+                const fileUniqueId = (0, _3_types_js_1.toUniqueFileId)(fileId_);
+                const fileId = (0, _3_types_js_1.serializeFileId)(fileId_);
                 const document = (0, _3_types_js_1.constructDocument)(document_, new _2_tl_js_1.types.DocumentAttributeFilename({ file_name: `${id[i] ?? "customEmoji"}.${(0, _0_deps_js_1.extension)(document_.mime_type)}` }), fileId, fileUniqueId);
                 documents.push(document);
             }
@@ -184,12 +179,14 @@ class FileManager {
         const documents_ = await __classPrivateFieldGet(this, _FileManager_c, "f").api.messages.getCustomEmojiDocuments({ document_id: id.map(BigInt) }).then((v) => v.map((v) => v[_2_tl_js_1.as](_2_tl_js_1.types.Document)));
         for (const [i, document_] of documents_.entries()) {
             await __classPrivateFieldGet(this, _FileManager_c, "f").messageStorage.setCustomEmojiDocument(document_.id, document_);
-            const fileUniqueId = new _3_types_js_1.FileUniqueID(_3_types_js_1.FileUniqueType.Document, { mediaId: document_.id }).encode();
-            const fileId = new _3_types_js_1.FileID(null, null, _3_types_js_1.FileType.Document, document_.dc_id, {
-                mediaId: document_.id,
-                accessHash: document_.access_hash,
+            const fileId_ = {
+                type: _3_types_js_1.FileType.Document,
+                dcId: document_.dc_id,
                 fileReference: document_.file_reference,
-            }).encode();
+                location: { type: "common", id: document_.id, accessHash: document_.access_hash },
+            };
+            const fileUniqueId = (0, _3_types_js_1.toUniqueFileId)(fileId_);
+            const fileId = (0, _3_types_js_1.serializeFileId)(fileId_);
             const document = (0, _3_types_js_1.constructDocument)(document_, new _2_tl_js_1.types.DocumentAttributeFilename({ file_name: `${id[i] ?? "customEmoji"}.${(0, _0_deps_js_1.extension)(document_.mime_type)}` }), fileId, fileUniqueId);
             documents.push(document);
         }

package/script/client/2_message_manager.js

@@ -366,7 +366,7 @@ class MessageManager {
         return (0, _3_types_js_2.assertMessageType)(message, "audio");
     }
     async sendVoice(chatId, voice, params) {
-        const message = await __classPrivateFieldGet(this, _MessageManager_instances, "m", _MessageManager_sendDocumentInner).call(this, chatId, voice, params, _3_types_js_2.FileType.Voice, [
+        const message = await __classPrivateFieldGet(this, _MessageManager_instances, "m", _MessageManager_sendDocumentInner).call(this, chatId, voice, params, _3_types_js_2.FileType.VoiceNote, [
             new _2_tl_js_1.types.DocumentAttributeAudio({
                 voice: true,
                 duration: params?.duration ?? 0,
@@ -429,22 +429,19 @@ class MessageManager {
     resolveFileId(maybeFileId, expectedFileType) {
         let fileId = null;
         try {
-            fileId = _3_types_js_2.FileID.decode(maybeFileId);
+            fileId = (0, _3_types_js_1.deserializeFileId)(maybeFileId);
         }
         catch (err) {
             __classPrivateFieldGet(this, _MessageManager_LresolveFileId, "f").warning(err);
         }
         if (fileId != null) {
-            if (fileId.fileType != expectedFileType) {
-                (0, _1_utilities_js_1.UNREACHABLE)();
-            }
-            if (fileId.params.mediaId == undefined || fileId.params.accessHash == undefined || fileId.params.fileReference == undefined) {
+            if (fileId.type != expectedFileType) {
                 (0, _1_utilities_js_1.UNREACHABLE)();
             }
             return {
-                id: fileId.params.mediaId,
-                access_hash: fileId.params.accessHash,
-                file_reference: fileId.params.fileReference,
+                id: "id" in fileId.location ? fileId.location.id : (0, _1_utilities_js_1.UNREACHABLE)(),
+                access_hash: fileId.location.accessHash,
+                file_reference: fileId.fileReference ?? new Uint8Array(),
             };
         }
         return null;

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

@@ -269,11 +269,11 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     branch(predicate: (ctx: UpdateIntersection<C>) => MaybePromise<boolean>, trueHandler_: Middleware<UpdateIntersection<C>>, falseHandler_: Middleware<UpdateIntersection<C>>): Composer<C>;
     filter<D extends C>(predicate: (ctx: UpdateIntersection<C>) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: UpdateIntersection<C>) => MaybePromise<boolean>, ...middleware: Middleware<UpdateIntersection<C>>[]): Composer<C>;
-    on<Q extends FilterQuery>(filter: Q, ...middleawre: Middleware<WithFilter<C, Q>>[]): Composer<UpdateIntersection<WithFilter<C, Q>>>;
+    on<Q extends FilterQuery>(filter: Q, ...middleware: Middleware<WithFilter<C, Q>>[]): Composer<UpdateIntersection<WithFilter<C, Q>>>;
     command(commands: string | RegExp | (string | RegExp)[] | {
         names: string | RegExp | (string | RegExp)[];
         prefixes: string | string[];
-    }, ...middleawre: Middleware<WithFilter<C, "message:text">>[]): Composer<WithFilter<C, "message:text">>;
+    }, ...middleware: Middleware<WithFilter<C, "message:text">>[]): Composer<WithFilter<C, "message:text">>;
     /**
      * Send a text message.
      *

package/script/client/4_client.js

@@ -1395,12 +1395,12 @@ class Client extends _0_client_abstract_js_1.ClientAbstract {
         this.branch(predicate, composer, _1_composer_js_1.skip);
         return composer;
     }
-    on(filter, ...middleawre) {
+    on(filter, ...middleware) {
         return this.filter((ctx) => {
             return (0, _0_filters_js_1.match)(filter, ctx);
-        }, ...middleawre);
+        }, ...middleware);
     }
-    command(commands, ...middleawre) {
+    command(commands, ...middleware) {
         const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
         const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
         const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Client_prefixes, "f") ?? []);
@@ -1441,7 +1441,7 @@ class Client extends _0_client_abstract_js_1.ClientAbstract {
                 }
             }
             return false;
-        }, ...middleawre);
+        }, ...middleware);
     }
     //#endregion
     /**