@mtkruto/browser 0.136.0 → 0.138.0

package/esm/types/7_inline_query_result.js

@@ -78,13 +78,14 @@ export function constructInlineQueryResult(result) {
         if (Api.is("botInlineMediaResult", result)) {
             if (result.photo) {
                 photo = Api.as("photo", result.photo);
-                ref = { fileId: getPhotoFileId(photo).fileId };
+                ref = { type: "fileId", fileId: getPhotoFileId(photo).fileId };
                 const { largest } = photoSizes = getPhotoSizes(photo);
                 attributes = [{ _: "documentAttributeImageSize", w: largest.w, h: largest.h }];
             }
             else if (result.document) {
                 const document = Api.as("document", result.document);
                 ref = {
+                    type: "fileId",
                     fileId: serializeFileId({
                         type: FileType.Document, // Should this be changed? The type is already known.
                         dcId: document.dc_id,
@@ -99,7 +100,7 @@ export function constructInlineQueryResult(result) {
             }
         }
         else if (result.content) {
-            ref = { url: result.content.url };
+            ref = { type: "url", url: result.content.url };
             attributes = result.content.attributes;
         }
         else {
@@ -116,90 +117,182 @@ export function constructInlineQueryResult(result) {
         switch (type) {
             case "audio": {
                 const a = attributes?.find((v) => Api.is("documentAttributeAudio", v));
-                return cleanObject({
-                    id,
-                    type,
-                    title,
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    performer: a?.performer,
-                    audioDuration: a?.duration,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        id,
+                        type: "cachedAudio",
+                        title,
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        performer: a?.performer,
+                        audioDuration: a?.duration,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        id,
+                        type,
+                        title,
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        performer: a?.performer,
+                        audioDuration: a?.duration,
+                    });
+                }
             }
             case "gif":
             case "mpeg4Gif": {
                 const a = attributes.find((v) => Api.is("documentAttributeVideo", v));
-                return cleanObject({
-                    id,
-                    type,
-                    title,
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    thumbnailUrl,
-                    width: a?.w,
-                    height: a?.h,
-                    duration: a?.duration,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        id,
+                        type: type === "gif" ? "cachedGif" : "cachedMpeg4Gif",
+                        title,
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                        width: a?.w,
+                        height: a?.h,
+                        duration: a?.duration,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        id,
+                        type,
+                        title,
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                        width: a?.w,
+                        height: a?.h,
+                        duration: a?.duration,
+                    });
+                }
             }
             case "photo": {
                 const a = attributes.find((v) => Api.is("documentAttributeImageSize", v));
-                return cleanObject({
-                    id,
-                    type,
-                    title,
-                    description,
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    thumbnailUrl: thumbnailUrl,
-                    thumbnails: photo ? photoSizes?.sizes.slice(0, -1).map((v) => constructThumbnail(v, photo)) : undefined,
-                    width: a?.w,
-                    height: a?.h,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        id,
+                        type: "cachedPhoto",
+                        title,
+                        description,
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl: thumbnailUrl,
+                        thumbnails: photo ? photoSizes?.sizes.slice(0, -1).map((v) => constructThumbnail(v, photo)) : undefined,
+                        width: a?.w,
+                        height: a?.h,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        id,
+                        type,
+                        title,
+                        description,
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl: thumbnailUrl,
+                        thumbnails: photo ? photoSizes?.sizes.slice(0, -1).map((v) => constructThumbnail(v, photo)) : undefined,
+                        width: a?.w,
+                        height: a?.h,
+                    });
+                }
             }
             case "video": {
                 const a = attributes.find((v) => Api.is("documentAttributeVideo", v));
-                return cleanObject({
-                    id,
-                    type,
-                    title,
-                    description,
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    mimeType: "content" in result && result.content ? result.content.mime_type : "video/mp4",
-                    thumbnailUrl: thumbnailUrl,
-                    width: a?.w,
-                    height: a?.h,
-                    videoDuration: a?.duration,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        id,
+                        type: "cachedVideo",
+                        title,
+                        description,
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        mimeType: "content" in result && result.content ? result.content.mime_type : "video/mp4",
+                        thumbnailUrl: thumbnailUrl,
+                        width: a?.w,
+                        height: a?.h,
+                        videoDuration: a?.duration,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        id,
+                        type: "video",
+                        title,
+                        description,
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        mimeType: "content" in result && result.content ? result.content.mime_type : "video/mp4",
+                        thumbnailUrl: thumbnailUrl,
+                        width: a?.w,
+                        height: a?.h,
+                        videoDuration: a?.duration,
+                    });
+                }
             }
             case "voice": {
                 const a = attributes.find((v) => Api.is("documentAttributeAudio", v));
-                return cleanObject({
-                    id,
-                    type,
-                    title,
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    thumbnailUrl,
-                    voiceDuration: a?.duration,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        id,
+                        type: "cachedVoice",
+                        title,
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                        voiceDuration: a?.duration,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        id,
+                        type: "voice",
+                        title,
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                        voiceDuration: a?.duration,
+                    });
+                }
             }
             case "document":
             case "file": // Does it really return this?
-                return cleanObject({
-                    type: "document",
-                    id,
-                    title: result.title ?? "",
-                    ...ref,
-                    messageContent,
-                    replyMarkup,
-                    thumbnailUrl,
-                });
+                if (ref.type === "fileId") {
+                    return cleanObject({
+                        type: "cachedDocument",
+                        id,
+                        title: result.title ?? "",
+                        fileId: ref.fileId,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                    });
+                }
+                else {
+                    return cleanObject({
+                        type: "document",
+                        id,
+                        title: result.title ?? "",
+                        url: ref.url,
+                        messageContent,
+                        replyMarkup,
+                        thumbnailUrl,
+                    });
+                }
         }
     }
     unreachable();
@@ -211,103 +304,77 @@ export async function inlineQueryResultToTlObject(result_, parseText, usernameRe
     let fileId_ = null;
     switch (result_.type) {
         case "audio":
-            if ("url" in result_) {
-                document = {
-                    _: "inputWebDocument",
-                    url: result_.url,
-                    size: 0,
-                    mime_type: "audio/mpeg",
-                    attributes: [
-                        { _: "documentAttributeAudio", duration: result_.audioDuration ?? 0, title: result_.title, performer: result_.performer },
-                    ],
-                };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = {
+                _: "inputWebDocument",
+                url: result_.url,
+                size: 0,
+                mime_type: "audio/mpeg",
+                attributes: [
+                    { _: "documentAttributeAudio", duration: result_.audioDuration ?? 0, title: result_.title, performer: result_.performer },
+                ],
+            };
             break;
         case "video":
-            if ("url" in result_) {
-                document = {
-                    _: "inputWebDocument",
-                    url: result_.url,
-                    size: 0,
-                    mime_type: result_.mimeType ?? "video/mp4",
-                    attributes: [
-                        { _: "documentAttributeVideo", duration: result_.videoDuration ?? 0, h: result_.height ?? 0, w: result_.width ?? 0 },
-                    ],
-                };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = {
+                _: "inputWebDocument",
+                url: result_.url,
+                size: 0,
+                mime_type: result_.mimeType ?? "video/mp4",
+                attributes: [
+                    { _: "documentAttributeVideo", duration: result_.videoDuration ?? 0, h: result_.height ?? 0, w: result_.width ?? 0 },
+                ],
+            };
             break;
         case "document":
-            if ("url" in result_) {
-                document = { _: "inputWebDocument", url: result_.url, mime_type: "application/octet-stream", attributes: [], size: 0 };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = { _: "inputWebDocument", url: result_.url, mime_type: "application/octet-stream", attributes: [], size: 0 };
             break;
         case "gif":
-            if ("url" in result_) {
-                document = {
-                    _: "inputWebDocument",
-                    url: result_.url,
-                    size: 0,
-                    mime_type: "image/gif",
-                    attributes: [
-                        { _: "documentAttributeVideo", duration: result_.duration ?? 0, w: result_.width ?? 0, h: result_.height ?? 0 },
-                    ],
-                };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = {
+                _: "inputWebDocument",
+                url: result_.url,
+                size: 0,
+                mime_type: "image/gif",
+                attributes: [
+                    { _: "documentAttributeVideo", duration: result_.duration ?? 0, w: result_.width ?? 0, h: result_.height ?? 0 },
+                ],
+            };
             break;
         case "mpeg4Gif":
-            if ("url" in result_) {
-                document = {
-                    _: "inputWebDocument",
-                    url: result_.url,
-                    size: 0,
-                    mime_type: "video/mp4",
-                    attributes: [
-                        { _: "documentAttributeVideo", nosound: true, duration: result_.duration ?? 0, w: result_.width ?? 0, h: result_.height ?? 0, supports_streaming: true },
-                    ],
-                };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = {
+                _: "inputWebDocument",
+                url: result_.url,
+                size: 0,
+                mime_type: "video/mp4",
+                attributes: [
+                    { _: "documentAttributeVideo", nosound: true, duration: result_.duration ?? 0, w: result_.width ?? 0, h: result_.height ?? 0, supports_streaming: true },
+                ],
+            };
             break;
         case "photo":
-            if ("url" in result_) {
-                document = { _: "inputWebDocument", url: result_.url, size: 0, mime_type: "image/jpeg", attributes: [{ _: "documentAttributeImageSize", w: result_.width ?? 0, h: result_.height ?? 0 }] };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = { _: "inputWebDocument", url: result_.url, size: 0, mime_type: "image/jpeg", attributes: [{ _: "documentAttributeImageSize", w: result_.width ?? 0, h: result_.height ?? 0 }] };
             break;
         case "sticker":
             fileId_ = result_.fileId;
             break;
         case "voice":
-            if ("url" in result_) {
-                document = {
-                    _: "inputWebDocument",
-                    url: result_.url,
-                    size: 0,
-                    mime_type: "audio/mpeg",
-                    attributes: [
-                        { _: "documentAttributeAudio", duration: result_.voiceDuration ?? 0, voice: true },
-                    ],
-                };
-            }
-            else {
-                fileId_ = result_.fileId;
-            }
+            document = {
+                _: "inputWebDocument",
+                url: result_.url,
+                size: 0,
+                mime_type: "audio/mpeg",
+                attributes: [
+                    { _: "documentAttributeAudio", duration: result_.voiceDuration ?? 0, voice: true },
+                ],
+            };
+            break;
+        case "cachedAudio":
+        case "cachedDocument":
+        case "cachedGif":
+        case "cachedMpeg4Gif":
+        case "cachedPhoto":
+        case "cachedVideo":
+        case "cachedVoice":
+            fileId_ = result_.fileId;
             break;
     }
     const replyMarkup = "replyMarkup" in result_ && result_.replyMarkup ? await replyMarkupToTlObject(result_.replyMarkup, usernameResolver) : undefined;

package/esm/types/7_topic.js

@@ -42,10 +42,10 @@ export function constructTopic(message) {
     const isHidden = false;
     let name = forumTopicCreated.forumTopicCreated.name;
     const color = forumTopicCreated.forumTopicCreated.color;
-    let customEmoijId = forumTopicCreated.forumTopicCreated.customEmojiId;
+    let customEmojiId = forumTopicCreated.forumTopicCreated.customEmojiId;
     if (forumTopicEdited) {
         name = forumTopicEdited.forumTopicEdited.name;
-        customEmoijId = forumTopicEdited.forumTopicEdited.customEmojiId;
+        customEmojiId = forumTopicEdited.forumTopicEdited.customEmojiId;
     }
     return cleanObject({
         id,
@@ -56,6 +56,6 @@ export function constructTopic(message) {
         isHidden,
         name,
         color,
-        customEmoijId,
+        customEmojiId,
     });
 }