@mtcute/core 0.30.2 → 0.31.0

package/highlevel/methods/ephemeral/send-ephemeral-message.d.cts

@@ -0,0 +1,29 @@
+import { tl } from '../../../tl/index.js';
+import { ITelegramClient } from '../../client.types.js';
+import { ReplyMarkup } from '../../types/bots/keyboards/index.js';
+import { EphemeralMessage, InputMediaLike, InputPeerLike, InputText } from '../../types/index.js';
+/**
+ * Send an ephemeral message — a message that is only visible
+ * to a single user in a chat and is not persisted in the chat history.
+ *
+ * @param chatId  ID of the chat to send the message to
+ * @param receiverId  ID of the user the message should be visible to
+ * @param text  Text of the message
+ */
+export declare function sendEphemeralMessage(client: ITelegramClient, chatId: InputPeerLike, receiverId: InputPeerLike, text: InputText, params?: {
+    /** Media to be attached to the message */
+    media?: InputMediaLike;
+    /** Message to reply to */
+    replyTo?: number;
+    /** Ephemeral message to reply to */
+    replyToEphemeral?: number;
+    /** Reply markup to be attached to the message */
+    replyMarkup?: ReplyMarkup;
+    /** For guest chat bots, ID of the query that this message is sent in response to */
+    queryId?: tl.Long;
+    /**
+     * Whether to dispatch the returned updates
+     * to the client's update handler.
+     */
+    shouldDispatch?: true;
+}): Promise<EphemeralMessage>;

package/highlevel/methods/ephemeral/send-ephemeral-message.d.ts

@@ -0,0 +1,29 @@
+import { tl } from '../../../tl/index.js';
+import { ITelegramClient } from '../../client.types.js';
+import { ReplyMarkup } from '../../types/bots/keyboards/index.js';
+import { EphemeralMessage, InputMediaLike, InputPeerLike, InputText } from '../../types/index.js';
+/**
+ * Send an ephemeral message — a message that is only visible
+ * to a single user in a chat and is not persisted in the chat history.
+ *
+ * @param chatId  ID of the chat to send the message to
+ * @param receiverId  ID of the user the message should be visible to
+ * @param text  Text of the message
+ */
+export declare function sendEphemeralMessage(client: ITelegramClient, chatId: InputPeerLike, receiverId: InputPeerLike, text: InputText, params?: {
+    /** Media to be attached to the message */
+    media?: InputMediaLike;
+    /** Message to reply to */
+    replyTo?: number;
+    /** Ephemeral message to reply to */
+    replyToEphemeral?: number;
+    /** Reply markup to be attached to the message */
+    replyMarkup?: ReplyMarkup;
+    /** For guest chat bots, ID of the query that this message is sent in response to */
+    queryId?: tl.Long;
+    /**
+     * Whether to dispatch the returned updates
+     * to the client's update handler.
+     */
+    shouldDispatch?: true;
+}): Promise<EphemeralMessage>;

package/highlevel/methods/ephemeral/send-ephemeral-message.js

@@ -0,0 +1,33 @@
+import { randomLong } from "../../../utils/long-utils.js";
+import { _normalizeInputMedia } from "../files/normalize-input-media.js";
+import { _normalizeInputText } from "../misc/normalize-text.js";
+import { resolvePeer, resolveUser } from "../users/resolve-peer.js";
+import { _findEphemeralMessageInUpdate } from "./find-in-update.js";
+import { _convertToTl } from "../../types/bots/keyboards/factories.js";
+async function sendEphemeralMessage(client, chatId, receiverId, text, params) {
+  const { media, replyTo, replyToEphemeral, queryId, shouldDispatch } = params ?? {};
+  const [message, entities] = await _normalizeInputText(client, text);
+  const peer = await resolvePeer(client, chatId);
+  let replyToTl;
+  if (replyTo !== void 0) {
+    replyToTl = { _: "inputReplyToMessage", replyToMsgId: replyTo };
+  } else if (replyToEphemeral !== void 0) {
+    replyToTl = { _: "inputReplyToEphemeralMessage", id: replyToEphemeral };
+  }
+  const res = await client.call({
+    _: "ephemeral.sendMessage",
+    peer,
+    receiverId: await resolveUser(client, receiverId),
+    queryId,
+    message,
+    entities,
+    media: media ? await _normalizeInputMedia(client, media, { uploadPeer: peer }) : void 0,
+    replyMarkup: _convertToTl(params?.replyMarkup),
+    randomId: randomLong(),
+    replyTo: replyToTl
+  });
+  return _findEphemeralMessageInUpdate(client, res, false, !shouldDispatch);
+}
+export {
+  sendEphemeralMessage
+};

package/highlevel/methods/files/download-iterable.cjs

@@ -230,12 +230,13 @@ async function* downloadAsIterable(client, input, params) {
   }).then(() => {
     client.log.debug("download workers finished");
   });
-  abortSignal$1?.addEventListener("abort", () => {
+  const onAbort = () => {
     client.log.debug("download aborted");
     error = abortSignal$1.reason;
     ended = true;
     nextChunkCv.notify();
-  });
+  };
+  abortSignal$1?.addEventListener("abort", onAbort);
   let position = offset;
   try {
     while (position < limitBytes) {
@@ -255,6 +256,7 @@ async function* downloadAsIterable(client, input, params) {
     }
   } finally {
     if (stallTimer) utils.timers.clearTimeout(stallTimer);
+    abortSignal$1?.removeEventListener("abort", onAbort);
   }
 }
 exports._normalizeFileDownloadLocation = _normalizeFileDownloadLocation;

package/highlevel/methods/files/download-iterable.js

@@ -223,12 +223,13 @@ async function* downloadAsIterable(client, input, params) {
   }).then(() => {
     client.log.debug("download workers finished");
   });
-  abortSignal?.addEventListener("abort", () => {
+  const onAbort = () => {
     client.log.debug("download aborted");
     error = abortSignal.reason;
     ended = true;
     nextChunkCv.notify();
-  });
+  };
+  abortSignal?.addEventListener("abort", onAbort);
   let position = offset;
   try {
     while (position < limitBytes) {
@@ -248,6 +249,7 @@ async function* downloadAsIterable(client, input, params) {
     }
   } finally {
     if (stallTimer) timers.clearTimeout(stallTimer);
+    abortSignal?.removeEventListener("abort", onAbort);
   }
 }
 export {

package/highlevel/methods/files/download-iterable.test.d.cts

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

package/highlevel/methods/files/download-iterable.test.d.ts

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

package/highlevel/methods/files/download-stream.cjs

@@ -19,11 +19,9 @@ function downloadAsStream(client, location, params) {
     });
   }
   const cancel = new AbortController();
-  if (params?.abortSignal) {
-    params?.abortSignal.addEventListener("abort", () => {
-      cancel.abort();
-    });
-  }
+  const onAbort = () => cancel.abort();
+  params?.abortSignal?.addEventListener("abort", onAbort);
+  const removeAbortListener = () => params?.abortSignal?.removeEventListener("abort", onAbort);
   const backpressureCv = new utils.ConditionVariable();
   return new ReadableStream({
     start(controller) {
@@ -38,13 +36,14 @@ function downloadAsStream(client, location, params) {
           controller.enqueue(chunk);
         }
         controller.close();
-      })().catch((e) => controller.error(e));
+      })().catch((e) => controller.error(e)).finally(removeAbortListener);
     },
     pull() {
       backpressureCv.notify();
     },
     cancel() {
       cancel.abort();
+      removeAbortListener();
     }
   }, {
     highWaterMark: params?.highWaterMark,

package/highlevel/methods/files/download-stream.js

@@ -12,11 +12,9 @@ function downloadAsStream(client, location, params) {
     });
   }
   const cancel = new AbortController();
-  if (params?.abortSignal) {
-    params?.abortSignal.addEventListener("abort", () => {
-      cancel.abort();
-    });
-  }
+  const onAbort = () => cancel.abort();
+  params?.abortSignal?.addEventListener("abort", onAbort);
+  const removeAbortListener = () => params?.abortSignal?.removeEventListener("abort", onAbort);
   const backpressureCv = new ConditionVariable();
   return new ReadableStream({
     start(controller) {
@@ -31,13 +29,14 @@ function downloadAsStream(client, location, params) {
           controller.enqueue(chunk);
         }
         controller.close();
-      })().catch((e) => controller.error(e));
+      })().catch((e) => controller.error(e)).finally(removeAbortListener);
     },
     pull() {
       backpressureCv.notify();
     },
     cancel() {
       cancel.abort();
+      removeAbortListener();
     }
   }, {
     highWaterMark: params?.highWaterMark,

package/highlevel/methods/forums/create-forum-topic.d.cts

@@ -6,6 +6,13 @@ import { InputPeerLike, Message } from '../../types/index.js';
  *
  * Only admins with `manageTopics` permission can do this.
  *
+ * > **Note**: for bots in private chats with "threaded mode" enabled,
+ * > message IDs are separate for each side of the chat, while the
+ * > canonical topic ID is always issued in the *user's* ID space.
+ * > The `.id` of the returned service message is in the *bot's* ID space,
+ * > and is **not** a valid topic ID — use `.replyToMessage.threadId` instead,
+ * > which is what all other methods (as well as Bot API's `message_thread_id`) expect.
+ *
  * @returns  Service message for the created topic
  */
 export declare function createForumTopic(client: ITelegramClient, params: {

package/highlevel/methods/forums/create-forum-topic.d.ts

@@ -6,6 +6,13 @@ import { InputPeerLike, Message } from '../../types/index.js';
  *
  * Only admins with `manageTopics` permission can do this.
  *
+ * > **Note**: for bots in private chats with "threaded mode" enabled,
+ * > message IDs are separate for each side of the chat, while the
+ * > canonical topic ID is always issued in the *user's* ID space.
+ * > The `.id` of the returned service message is in the *bot's* ID space,
+ * > and is **not** a valid topic ID — use `.replyToMessage.threadId` instead,
+ * > which is what all other methods (as well as Bot API's `message_thread_id`) expect.
+ *
  * @returns  Service message for the created topic
  */
 export declare function createForumTopic(client: ITelegramClient, params: {

package/highlevel/methods/forums/delete-forum-topic-history.d.cts

@@ -4,7 +4,7 @@ import { ForumTopic, InputPeerLike } from '../../types/index.js';
  * Delete a forum topic and all its history
  *
  * @param chat  Chat or user ID, username, phone number, `"me"` or `"self"`
- * @param topicId  ID of the topic (i.e. its top message ID)
+ * @param topicId  ID of the topic (i.e. its top message ID, see note at {@link createForumTopic})
  */
 export declare function deleteForumTopicHistory(client: ITelegramClient, chat: InputPeerLike, topicId: number | ForumTopic, params?: {
     /**

package/highlevel/methods/forums/delete-forum-topic-history.d.ts

@@ -4,7 +4,7 @@ import { ForumTopic, InputPeerLike } from '../../types/index.js';
  * Delete a forum topic and all its history
  *
  * @param chat  Chat or user ID, username, phone number, `"me"` or `"self"`
- * @param topicId  ID of the topic (i.e. its top message ID)
+ * @param topicId  ID of the topic (i.e. its top message ID, see note at {@link createForumTopic})
  */
 export declare function deleteForumTopicHistory(client: ITelegramClient, chat: InputPeerLike, topicId: number | ForumTopic, params?: {
     /**

package/highlevel/methods/forums/edit-forum-topic.cjs

@@ -15,7 +15,7 @@ async function editForumTopic(client, params) {
     peer: await resolvePeer.resolvePeer(client, chatId),
     topicId: typeof topicId === "number" ? topicId : topicId.id,
     title,
-    iconEmojiId: icon ? icon ?? Long.ZERO : void 0,
+    iconEmojiId: icon === null ? Long.ZERO : icon,
     closed,
     hidden
   });

package/highlevel/methods/forums/edit-forum-topic.d.cts

@@ -7,13 +7,13 @@ import { ForumTopic, InputPeerLike, Message } from '../../types/index.js';
  * Only admins with `manageTopics` permission can do this.
  *
  * @param chatId  Chat ID or username
- * @param topicId  ID of the topic (i.e. its top message ID)
+ * @param topicId  ID of the topic (i.e. its top message ID, see note at {@link createForumTopic})
  * @returns  Service message about the modification
  */
 export declare function editForumTopic(client: ITelegramClient, params: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /**
      * New topic title

package/highlevel/methods/forums/edit-forum-topic.d.ts

@@ -7,13 +7,13 @@ import { ForumTopic, InputPeerLike, Message } from '../../types/index.js';
  * Only admins with `manageTopics` permission can do this.
  *
  * @param chatId  Chat ID or username
- * @param topicId  ID of the topic (i.e. its top message ID)
+ * @param topicId  ID of the topic (i.e. its top message ID, see note at {@link createForumTopic})
  * @returns  Service message about the modification
  */
 export declare function editForumTopic(client: ITelegramClient, params: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /**
      * New topic title

package/highlevel/methods/forums/edit-forum-topic.js

@@ -8,7 +8,7 @@ async function editForumTopic(client, params) {
     peer: await resolvePeer(client, chatId),
     topicId: typeof topicId === "number" ? topicId : topicId.id,
     title,
-    iconEmojiId: icon ? icon ?? Long.ZERO : void 0,
+    iconEmojiId: icon === null ? Long.ZERO : icon,
     closed,
     hidden
   });

package/highlevel/methods/forums/get-forum-topics-by-id.cjs

@@ -14,6 +14,10 @@ async function getForumTopicsById(client, chatId, ids) {
     peer: await resolvePeer.resolvePeer(client, chatId),
     topics: ids
   });
-  return forumTopic.ForumTopic.parseTlForumTopics(res);
+  const index = /* @__PURE__ */ new Map();
+  for (const topic of forumTopic.ForumTopic.parseTlForumTopics(res)) {
+    index.set(topic.id, topic);
+  }
+  return ids.map((id) => index.get(id) ?? null);
 }
 exports.getForumTopicsById = getForumTopicsById;

package/highlevel/methods/forums/get-forum-topics-by-id.d.cts

@@ -4,6 +4,14 @@ import { InputPeerLike, ForumTopic } from '../../types/index.js';
 /**
  * Get forum topics by their IDs
  *
+ * The returned array is aligned with the input IDs.
+ * For topics that were deleted (or never existed),
+ * `null` will be returned at that position.
+ *
+ * > **Note**: for bots in private chats with "threaded mode" enabled,
+ * > only canonical (user-space) topic IDs are accepted —
+ * > see the note at {@link createForumTopic}
+ *
  * @param chatId  Chat ID or username
  */
-export declare function getForumTopicsById(client: ITelegramClient, chatId: InputPeerLike, ids: MaybeArray<number>): Promise<ForumTopic[]>;
+export declare function getForumTopicsById(client: ITelegramClient, chatId: InputPeerLike, ids: MaybeArray<number>): Promise<(ForumTopic | null)[]>;

package/highlevel/methods/forums/get-forum-topics-by-id.d.ts

@@ -4,6 +4,14 @@ import { InputPeerLike, ForumTopic } from '../../types/index.js';
 /**
  * Get forum topics by their IDs
  *
+ * The returned array is aligned with the input IDs.
+ * For topics that were deleted (or never existed),
+ * `null` will be returned at that position.
+ *
+ * > **Note**: for bots in private chats with "threaded mode" enabled,
+ * > only canonical (user-space) topic IDs are accepted —
+ * > see the note at {@link createForumTopic}
+ *
  * @param chatId  Chat ID or username
  */
-export declare function getForumTopicsById(client: ITelegramClient, chatId: InputPeerLike, ids: MaybeArray<number>): Promise<ForumTopic[]>;
+export declare function getForumTopicsById(client: ITelegramClient, chatId: InputPeerLike, ids: MaybeArray<number>): Promise<(ForumTopic | null)[]>;

package/highlevel/methods/forums/get-forum-topics-by-id.js

@@ -7,7 +7,11 @@ async function getForumTopicsById(client, chatId, ids) {
     peer: await resolvePeer(client, chatId),
     topics: ids
   });
-  return ForumTopic$2.parseTlForumTopics(res);
+  const index = /* @__PURE__ */ new Map();
+  for (const topic of ForumTopic$2.parseTlForumTopics(res)) {
+    index.set(topic.id, topic);
+  }
+  return ids.map((id) => index.get(id) ?? null);
 }
 export {
   getForumTopicsById

package/highlevel/methods/forums/get-forum-topics-by-id.test.d.cts

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

package/highlevel/methods/forums/get-forum-topics-by-id.test.d.ts

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

package/highlevel/methods/forums/get-forum-topics.cjs

@@ -6,8 +6,8 @@ if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WAR
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const resolvePeer = require("../users/resolve-peer.cjs");
-const miscUtils = require("../../utils/misc-utils.cjs");
 const forumTopic = require("../../types/peers/forum-topic.cjs");
+const miscUtils = require("../../utils/misc-utils.cjs");
 const defaultOffset = {
   date: 0,
   id: 0,

package/highlevel/methods/forums/get-forum-topics.js

@@ -1,6 +1,6 @@
 import { resolvePeer } from "../users/resolve-peer.js";
-import { makeArrayPaginated } from "../../utils/misc-utils.js";
 import { ForumTopic as ForumTopic$2 } from "../../types/peers/forum-topic.js";
+import { makeArrayPaginated } from "../../utils/misc-utils.js";
 const defaultOffset = {
   date: 0,
   id: 0,

package/highlevel/methods/forums/toggle-forum-topic-closed.d.cts

@@ -10,7 +10,7 @@ import { ForumTopic, InputPeerLike, Message } from '../../types/index.js';
 export declare function toggleForumTopicClosed(client: ITelegramClient, parmas: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /** Whether the topic should be closed */
     closed: boolean;

package/highlevel/methods/forums/toggle-forum-topic-closed.d.ts

@@ -10,7 +10,7 @@ import { ForumTopic, InputPeerLike, Message } from '../../types/index.js';
 export declare function toggleForumTopicClosed(client: ITelegramClient, parmas: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /** Whether the topic should be closed */
     closed: boolean;

package/highlevel/methods/forums/toggle-forum-topic-pinned.d.cts

@@ -8,7 +8,7 @@ import { ForumTopic, InputPeerLike } from '../../types/index.js';
 export declare function toggleForumTopicPinned(client: ITelegramClient, params: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /** Whether the topic should be pinned */
     pinned: boolean;

package/highlevel/methods/forums/toggle-forum-topic-pinned.d.ts

@@ -8,7 +8,7 @@ import { ForumTopic, InputPeerLike } from '../../types/index.js';
 export declare function toggleForumTopicPinned(client: ITelegramClient, params: {
     /** Chat ID or username */
     chatId: InputPeerLike;
-    /** ID of the topic (i.e. its top message ID) */
+    /** ID of the topic (i.e. its top message ID, see note at {@link createForumTopic}) */
     topicId: number | ForumTopic;
     /** Whether the topic should be pinned */
     pinned: boolean;

package/highlevel/methods/forums/toggle-general-topic-hidden.cjs

@@ -10,8 +10,8 @@ const resolvePeer = require("../users/resolve-peer.cjs");
 async function toggleGeneralTopicHidden(client, params) {
   const { chatId, hidden, shouldDispatch } = params;
   const res = await client.call({
-    _: "channels.editForumTopic",
-    channel: await resolvePeer.resolveChannel(client, chatId),
+    _: "messages.editForumTopic",
+    peer: await resolvePeer.resolvePeer(client, chatId),
     topicId: 1,
     hidden
   });

package/highlevel/methods/forums/toggle-general-topic-hidden.js

@@ -1,10 +1,10 @@
 import { _findMessageInUpdate } from "../messages/find-in-update.js";
-import { resolveChannel } from "../users/resolve-peer.js";
+import { resolvePeer } from "../users/resolve-peer.js";
 async function toggleGeneralTopicHidden(client, params) {
   const { chatId, hidden, shouldDispatch } = params;
   const res = await client.call({
-    _: "channels.editForumTopic",
-    channel: await resolveChannel(client, chatId),
+    _: "messages.editForumTopic",
+    peer: await resolvePeer(client, chatId),
     topicId: 1,
     hidden
   });

package/highlevel/methods/messages/send-common.d.cts

@@ -13,7 +13,13 @@ export interface CommonSendParams {
      * Can also be a message from another chat, in which case a quote will be sent.
      */
     replyTo?: number | Message;
-    /** ID of the thread to reply to */
+    /**
+     * ID of the thread (topic) to reply to
+     *
+     * > **Note**: for bots in private chats with "threaded mode" enabled,
+     * > this must be the canonical (user-space) topic ID —
+     * > see the note at {@link createForumTopic}
+     */
     threadId?: number;
     /**
      * If this is a reply to a specific todo item, ID of that item

package/highlevel/methods/messages/send-common.d.ts

@@ -13,7 +13,13 @@ export interface CommonSendParams {
      * Can also be a message from another chat, in which case a quote will be sent.
      */
     replyTo?: number | Message;
-    /** ID of the thread to reply to */
+    /**
+     * ID of the thread (topic) to reply to
+     *
+     * > **Note**: for bots in private chats with "threaded mode" enabled,
+     * > this must be the canonical (user-space) topic ID —
+     * > see the note at {@link createForumTopic}
+     */
     threadId?: number;
     /**
      * If this is a reply to a specific todo item, ID of that item

package/highlevel/methods/messages/send-text.cjs

@@ -18,6 +18,49 @@ const findInUpdate = require("./find-in-update.cjs");
 const sendCommon = require("./send-common.cjs");
 const factories = require("../../types/bots/keyboards/factories.cjs");
 const peersIndex = require("../../types/peers/peers-index.cjs");
+function _inputReplyToToHeader(replyTo, peer) {
+  if (!replyTo) return [void 0, void 0];
+  switch (replyTo._) {
+    case "inputReplyToMessage": {
+      const replyToPeerId = replyTo.replyToPeerId && peerUtils$1.getMarkedPeerId(replyTo.replyToPeerId) !== peerUtils$1.getMarkedPeerId(peer) ? peerUtils.inputPeerToPeer(replyTo.replyToPeerId) : void 0;
+      return [
+        {
+          _: "messageReplyHeader",
+          replyToMsgId: replyTo.replyToMsgId,
+          replyToPeerId,
+          replyToTopId: replyTo.topMsgId,
+          quote: replyTo.quoteText !== void 0 ? true : void 0,
+          quoteText: replyTo.quoteText,
+          quoteEntities: replyTo.quoteEntities,
+          quoteOffset: replyTo.quoteOffset,
+          todoItemId: replyTo.todoItemId,
+          pollOption: replyTo.pollOption
+        },
+        replyTo.monoforumPeerId ? peerUtils.inputPeerToPeer(replyTo.monoforumPeerId) : void 0
+      ];
+    }
+    case "inputReplyToStory":
+      return [
+        {
+          _: "messageReplyStoryHeader",
+          peer: peerUtils.inputPeerToPeer(replyTo.peer),
+          storyId: replyTo.storyId
+        },
+        void 0
+      ];
+    case "inputReplyToMonoForum":
+      return [void 0, peerUtils.inputPeerToPeer(replyTo.monoforumPeerId)];
+    case "inputReplyToEphemeralMessage":
+      return [
+        {
+          _: "messageReplyHeader",
+          replyToEphemeral: true,
+          replyToMsgId: replyTo.id
+        },
+        void 0
+      ];
+  }
+}
 async function sendText(client, chatId, text, params) {
   if (!params) params = {};
   const [message$1, entities] = await normalizeText._normalizeInputText(client, text);
@@ -28,6 +71,7 @@ async function sendText(client, chatId, text, params) {
     params
   );
   const randomId = params.randomId ?? longUtils.randomLong();
+  const sendAs = params.sendAs ? await resolvePeer.resolvePeer(client, params.sendAs) : void 0;
   const res = await client.call(
     {
       _: "messages.sendMessage",
@@ -42,7 +86,7 @@ async function sendText(client, chatId, text, params) {
       entities,
       clearDraft: params.clearDraft,
       noforwards: params.forbidForwards,
-      sendAs: params.sendAs ? await resolvePeer.resolvePeer(client, params.sendAs) : void 0,
+      sendAs,
       invertMedia: params.invertMedia,
       quickReplyShortcut,
       effect: params.effect,
@@ -56,16 +100,25 @@ async function sendText(client, chatId, text, params) {
     }
   );
   if (res._ === "updateShortSentMessage") {
+    const [replyToHeader, savedPeerId] = _inputReplyToToHeader(replyTo, peer);
     const msg2 = {
       _: "message",
       id: res.id,
       peerId: peerUtils.inputPeerToPeer(peer),
-      fromId: { _: "peerUser", userId: client.storage.self.getCached().userId },
+      fromId: sendAs ? peerUtils.inputPeerToPeer(sendAs) : { _: "peerUser", userId: client.storage.self.getCached().userId },
+      savedPeerId,
+      replyTo: replyToHeader,
       message: message$1,
       date: res.date,
       out: res.out,
+      silent: params.silent,
+      noforwards: params.forbidForwards,
+      invertMedia: params.invertMedia,
+      effect: params.effect,
       replyMarkup,
-      entities: res.entities
+      media: res.media,
+      entities: res.entities,
+      ttlPeriod: res.ttlPeriod
     };
     if (!params.shouldDispatch) {
       client.handleClientUpdate(utils.createDummyUpdate(res.pts, res.ptsCount));
@@ -99,7 +152,20 @@ async function sendText(client, chatId, text, params) {
           );
       }
     };
-    await Promise.all([fetchPeer(peer), fetchPeer(msg2.fromId)]);
+    const peersToFetch = [peer, msg2.fromId];
+    if (savedPeerId) peersToFetch.push(savedPeerId);
+    if (replyToHeader?._ === "messageReplyHeader" && replyToHeader.replyToPeerId) {
+      peersToFetch.push(replyToHeader.replyToPeerId);
+    } else if (replyToHeader?._ === "messageReplyStoryHeader") {
+      peersToFetch.push(replyToHeader.peer);
+    }
+    await Promise.all(peersToFetch.map(fetchPeer));
+    if (replyToHeader?._ === "messageReplyHeader" && replyToHeader.replyToTopId && replyToHeader.replyToTopId !== 1 && msg2.peerId._ === "peerChannel") {
+      const chat = peers.chats.get(msg2.peerId.channelId);
+      if (chat?._ === "channel" && chat.forum) {
+        replyToHeader.forumTopic = true;
+      }
+    }
     const ret = new message.Message(msg2, peers);
     return ret;
   }