@imessaging/telegram-mtproto 0.8.2 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imessaging/telegram-mtproto",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Telegram MTProto user-account transport for imessaging",
   "keywords": [
     "messaging",
@@ -31,7 +31,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@imessaging/core": "^0.8.2",
+    "@imessaging/core": "^0.8.3",
     "big-integer": "^1.6.52"
   },
   "peerDependencies": {

package/src/entities.ts

@@ -22,6 +22,10 @@ export function toTelegramEntities(ft: FormattedText): Api.TypeMessageEntity[] {
         return new Api.MessageEntityPre({ ...base, language: e.language ?? "" });
       case "link":
         return new Api.MessageEntityTextUrl({ ...base, url: e.url ?? "" });
+      case "spoiler":
+        return new Api.MessageEntitySpoiler(base);
+      case "quote":
+        return new Api.MessageEntityBlockquote(base);
     }
   });
 }

package/src/incoming.ts

@@ -1,4 +1,10 @@
-import type { IncomingAttachment, IncomingLink, IncomingMessage } from "@imessaging/core";
+import type {
+  IncomingAttachment,
+  IncomingLink,
+  IncomingMessage,
+  TextEntity,
+  TextEntityType,
+} from "@imessaging/core";
 
 /** Пир MTProto в той части, по которой определяется чат. Приходит из `Api.TypePeer`. */
 export type MtprotoPeerLike = {
@@ -93,6 +99,7 @@ export type MtprotoEntityLike = {
   offset?: number;
   length?: number;
   url?: string;
+  language?: string;
 };
 
 /** Кнопка под сообщением. Адрес несёт только `KeyboardButtonUrl`, у остальных его нет. */
@@ -233,6 +240,35 @@ export function collectLinks(message: MtprotoMessageLike): IncomingLink[] {
   return links;
 }
 
+const FORMATTING: Record<string, TextEntityType> = {
+  MessageEntityBold: "bold",
+  MessageEntityItalic: "italic",
+  MessageEntityUnderline: "underline",
+  MessageEntityStrike: "strike",
+  MessageEntitySpoiler: "spoiler",
+  MessageEntityCode: "code",
+  MessageEntityPre: "pre",
+  MessageEntityTextUrl: "link",
+  MessageEntityBlockquote: "quote",
+};
+
+export function formattingEntities(message: MtprotoMessageLike): TextEntity[] {
+  const result: TextEntity[] = [];
+  for (const entity of message.entities ?? []) {
+    // Упоминания, хэштеги, голые адреса — не форматирование: пары в общей модели у них нет.
+    const type = FORMATTING[entity.className ?? ""];
+    if (!type || entity.offset === undefined || entity.length === undefined) continue;
+    result.push({
+      type,
+      offset: entity.offset,
+      length: entity.length,
+      ...(type === "link" && entity.url ? { url: entity.url } : {}),
+      ...(type === "pre" && entity.language ? { language: entity.language } : {}),
+    });
+  }
+  return result;
+}
+
 /**
  * Сообщение живой учётной записи → общий вид.
  *
@@ -297,6 +333,7 @@ export function toIncomingMessage(
     sentAt: message.date ? new Date(message.date * 1000) : undefined,
     // Непоправленное сообщение приходит с `editDate: null` — это не правка в 1970 году.
     editedAt: message.editDate ? new Date(message.editDate * 1000) : undefined,
+    entities: formattingEntities(message),
     attachments: collectAttachments(message, chatId),
     links: collectLinks(message),
     mentionsMe: typeof message.mentioned === "boolean" ? message.mentioned : undefined,

package/src/index.ts

@@ -7,6 +7,7 @@ export {
   collectAttachments,
   collectLinks,
   downloadFromMessage,
+  formattingEntities,
   IncomingDispatcher,
   peerToChat,
   unmarkPeerId,

package/src/telegram-mtproto-transport.ts

@@ -7,6 +7,7 @@ import type {
   ReadReceiptTransport,
   EditableMessage,
   EditableMessageTransport,
+  EditedMessageTransport,
   EditResult,
   MessageReaction,
   MessageRecipient,
@@ -27,6 +28,7 @@ import { Api, TelegramClient } from "telegram";
 import { CustomFile } from "telegram/client/uploads";
 import { CallbackQuery } from "telegram/events/CallbackQuery";
 import { NewMessage } from "telegram/events/NewMessage";
+import { EditedMessage } from "telegram/events/EditedMessage";
 import type { TelegramClientParams } from "telegram/client/telegramBaseClient";
 import { StringSession } from "telegram/sessions";
 
@@ -89,6 +91,7 @@ function isChannel(chat: Api.TypeChat): chat is Api.Channel {
 export class TelegramMtprotoTransport
   implements
     EditableMessageTransport,
+    EditedMessageTransport,
     ButtonPressTransport,
     IncomingMessageTransport,
     ReactionTransport,
@@ -102,6 +105,8 @@ export class TelegramMtprotoTransport
   private lastActivityAt?: Date;
   private readonly incoming = new IncomingDispatcher();
   private incomingListener: ((event: unknown) => void) | null = null;
+  private readonly edits = new IncomingDispatcher();
+  private editListener: ((event: unknown) => void) | null = null;
   /** Отметка жизни подписки: срабатывает на любом обновлении, включая служебные. */
   private activityListener: ((event: unknown) => void) | null = null;
 
@@ -187,6 +192,34 @@ export class TelegramMtprotoTransport
     };
   }
 
+  onEdit(handler: (message: IncomingMessage) => void | Promise<void>): () => void {
+    const remove = this.edits.add(handler);
+    this.startEditListeningIfNeeded();
+    return () => {
+      remove();
+      this.stopEditListeningIfIdle();
+    };
+  }
+
+  private startEditListeningIfNeeded(): void {
+    if (this.editListener !== null || this.edits.size === 0) return;
+    const listener = (event: unknown): void => {
+      const message = (event as { message?: MtprotoMessageLike }).message;
+      if (!message) return;
+      this.lastActivityAt = new Date();
+      void this.rememberSender(message);
+      void this.edits.dispatch(message, this.id, this.options.accountId);
+    };
+    this.editListener = listener;
+    this.client.addEventHandler(listener, new EditedMessage({}));
+  }
+
+  private stopEditListeningIfIdle(): void {
+    if (this.edits.size > 0 || this.editListener === null) return;
+    this.client.removeEventHandler(this.editListener, new EditedMessage({}));
+    this.editListener = null;
+  }
+
   private startListeningIfNeeded(): void {
     if (this.incomingListener !== null || this.incoming.size === 0) return;
     const listener = (event: unknown): void => {