@ethora/chat-component-rn 26.10.4 → 26.10.6

package/lib/module/helpers/caption.js

@@ -0,0 +1,207 @@
+"use strict";
+
+import { safeJsonParse } from './safeJson';
+import { validateMentionSpans } from './mentionSpans';
+import { getAttachmentName, getMessageAttachments, isMediaMessage } from './attachments';
+
+/**
+ * The text typed with a set of attachments, sent as part of the media
+ * message itself (never as a separate text stanza).
+ *
+ * `mentions` index into `text`, the same way a text message's mention spans
+ * index into its body.
+ */
+
+const isSpanShape = value => {
+  if (!value || typeof value !== 'object') return false;
+  const span = value;
+  return typeof span.jid === 'string' && typeof span.name === 'string' && typeof span.offset === 'number' && Number.isInteger(span.offset) && typeof span.length === 'number' && Number.isInteger(span.length);
+};
+
+/**
+ * Mention spans for a caption, checked against the caption text: a span that
+ * no longer reads "@Name" at its offset is dropped. Undefined when nothing is
+ * left, so a caption without mentions carries no empty attribute.
+ */
+export const normalizeCaptionMentions = (value, caption) => {
+  const parsed = typeof value === 'string' ? safeJsonParse(value, []) : value;
+  if (!Array.isArray(parsed)) return undefined;
+  const spans = validateMentionSpans(caption, parsed.filter(isSpanShape));
+  return spans.length > 0 ? spans : undefined;
+};
+
+/**
+ * Turns what the composer typed into the caption that travels with the
+ * media. Undefined for blank text, which means "no caption".
+ */
+export const normalizeCaptionInput = input => {
+  const text = typeof input?.text === 'string' ? input.text : '';
+  if (!/\S/.test(text)) return undefined;
+  const mentions = normalizeCaptionMentions(input?.mentions, text);
+  return mentions ? {
+    caption: text,
+    mentions
+  } : {
+    caption: text
+  };
+};
+
+/** What a media message's text is, and the @-mention spans that index into it. */
+
+/**
+ * Bodies that are not something a person typed: the media placeholder every
+ * SDK sends, and the labels apps generate for a file with nothing to say.
+ */
+const PLACEHOLDER_BODIES = new Set(['media', 'attachment', 'attachments', 'photo', 'photos', 'image', 'images', 'picture', 'video', 'audio', 'voice', 'voice message', 'voice note', 'file', 'files', 'document', 'blob', 'undefined', 'null', '[object object]']);
+
+/** `<data>` attributes older or foreign clients stamp the file's text on. */
+const CAPTION_ALIASES = ['captionText', 'text', 'message', 'description', 'title'];
+const norm = value => typeof value === 'string' ? value.trim().toLowerCase() : '';
+const str = value => typeof value === 'string' ? value : typeof value === 'number' ? String(value) : '';
+const tail = url => {
+  const path = url.split(/[?#]/)[0];
+  return path.slice(path.lastIndexOf('/') + 1);
+};
+const safeDecode = value => {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return value;
+  }
+};
+
+/** Every string a media message's `body` is allowed to merely repeat. */
+const echoCandidates = (message, options) => {
+  const out = new Set();
+  const add = value => {
+    const v = norm(value);
+    if (v) out.add(v);
+  };
+
+  // The file itself: its names and its URLs, as sent and as stored.
+  const attachments = getMessageAttachments(message);
+  for (const attachment of attachments) {
+    add(getAttachmentName(attachment));
+    add(attachment.originalName);
+    add(attachment.fileName);
+    for (const url of [attachment.location, attachment.locationPreview]) {
+      if (!url) continue;
+      add(url);
+      add(safeDecode(url));
+      add(tail(url));
+      add(safeDecode(tail(url)));
+    }
+  }
+  add(message.originalName);
+  add(message.fileName);
+  add(message.location);
+  add(message.locationPreview);
+
+  // The sender: some clients put their own name, e-mail or username in the
+  // body next to the file.
+  const user = message.user ?? {};
+  const first = str(message.senderFirstName) || str(message.firstName) || str(user.firstName);
+  const last = str(message.senderLastName) || str(message.lastName) || str(user.lastName);
+  add(user.name);
+  add(`${first} ${last}`);
+  add(first && !last ? first : '');
+  add(user.email);
+  add(user.username);
+  add(message.email);
+  add(message.userName);
+  add(message.username);
+  add(message.senderName);
+  const idLocal = str(user.id).split('@')[0];
+  add(idLocal);
+  add(str(user.id).split('_').pop());
+  add(str(message.senderJID).split('/')[0].split('@')[0]);
+  for (const name of options.senderNames ?? []) add(name);
+  return out;
+};
+
+/** "etest etest" is echoed as "etest": every word of the name is the body. */
+const isRepeatedName = (name, text) => Boolean(name && text) && name.split(/\s+/).every(part => part === text);
+const isRealCaptionText = (text, message, options) => {
+  const t = text.trim();
+  if (!t) return false;
+  const n = t.toLowerCase();
+  if (PLACEHOLDER_BODIES.has(n)) return false;
+  // The key envelope a sealed message carries in its body is never text.
+  if (/^\{\s*"v"\s*:\s*\d+\s*,\s*"keys"/.test(t)) return false;
+  const candidates = echoCandidates(message, options);
+  if (candidates.has(n)) return false;
+  for (const name of candidates) if (isRepeatedName(name, n)) return false;
+  return true;
+};
+const asRecord = message => message && typeof message === 'object' ? message : undefined;
+const resolveSpans = (message, text, keys) => {
+  for (const key of keys) {
+    const spans = normalizeCaptionMentions(message[key] ?? message.data?.[key], text);
+    if (spans) return spans;
+  }
+  return undefined;
+};
+
+/**
+ * The text of a media message, from whichever format carried it. The one
+ * place that knows the formats, so every surface (bubble, room list preview,
+ * notification, reply quote, copy) agrees:
+ *
+ *  1. `caption` (+ `captionMentions`): what this SDK sends. The only source
+ *     for a sealed message, whose caption comes out of the envelope.
+ *  2. The caption under another name on `<data>` (`captionText`, `text`,
+ *     `message`, `description`, `title`) from other clients.
+ *  3. A real `body`: older clients and other SDKs put the text in the
+ *     `<body>` of the media message itself. "media", the file's name or URL,
+ *     the sender's own name or e-mail and generated labels are not text.
+ *
+ * Never derived for a sealed message, and never for a message with no file.
+ */
+export const resolveMessageCaption = (message, options = {}) => {
+  const source = asRecord(message);
+  if (!source || source.isDeleted) return undefined;
+  const explicit = source.caption;
+  if (typeof explicit === 'string' && /\S/.test(explicit)) {
+    const mentions = normalizeCaptionMentions(source.captionMentions, explicit);
+    return mentions ? {
+      text: explicit,
+      mentions
+    } : {
+      text: explicit
+    };
+  }
+  const sealed = options.sealed === true || source.clientEncrypted === 'true' || Array.isArray(source.e2eeKeys) && source.e2eeKeys.length > 0;
+  if (sealed) return undefined;
+  const isMedia = options.isMedia ?? isMediaMessage(source);
+  if (!isMedia) return undefined;
+  for (const key of CAPTION_ALIASES) {
+    const value = str(source[key] ?? source.data?.[key]);
+    if (value && isRealCaptionText(value, source, options)) {
+      const mentions = resolveSpans(source, value, ['captionMentions']);
+      return mentions ? {
+        text: value,
+        mentions
+      } : {
+        text: value
+      };
+    }
+  }
+  const body = str(source.body);
+  if (body && isRealCaptionText(body, source, options)) {
+    const mentions = resolveSpans(source, body, ['mentions']);
+    return mentions ? {
+      text: body,
+      mentions
+    } : {
+      text: body
+    };
+  }
+  return undefined;
+};
+
+/** The caption a message carries, or undefined when it has none. */
+export const getMessageCaption = (message, options) => resolveMessageCaption(message, options)?.text;
+
+/** The mention spans of `getMessageCaption`'s text. */
+export const getMessageCaptionMentions = (message, options) => resolveMessageCaption(message, options)?.mentions;
+//# sourceMappingURL=caption.js.map

package/lib/module/helpers/caption.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["safeJsonParse","validateMentionSpans","getAttachmentName","getMessageAttachments","isMediaMessage","isSpanShape","value","span","jid","name","offset","Number","isInteger","length","normalizeCaptionMentions","caption","parsed","Array","isArray","undefined","spans","filter","normalizeCaptionInput","input","text","test","mentions","PLACEHOLDER_BODIES","Set","CAPTION_ALIASES","norm","trim","toLowerCase","str","String","tail","url","path","split","slice","lastIndexOf","safeDecode","decodeURIComponent","echoCandidates","message","options","out","add","v","attachments","attachment","originalName","fileName","location","locationPreview","user","first","senderFirstName","firstName","last","senderLastName","lastName","email","username","userName","senderName","idLocal","id","pop","senderJID","senderNames","isRepeatedName","Boolean","every","part","isRealCaptionText","t","n","has","candidates","asRecord","resolveSpans","keys","key","data","resolveMessageCaption","source","isDeleted","explicit","captionMentions","sealed","clientEncrypted","e2eeKeys","isMedia","body","getMessageCaption","getMessageCaptionMentions"],"sourceRoot":"../../../src","sources":["helpers/caption.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/createMainMessageForThread.js

@@ -1,8 +1,12 @@
 "use strict";
 
+import { getMessageCaption } from './caption';
 export const createMainMessageForThread = message => {
+  // A media message is quoted by its caption. A sealed one never is: the
+  // reply stanza travels in the clear, the caption does not.
+  const caption = message.clientEncrypted === 'true' ? undefined : getMessageCaption(message);
   const data = {
-    text: message.body,
+    text: caption ?? message.body,
     id: message.id,
     userName: message.user.name,
     createdAt: message.date,

package/lib/module/helpers/createMainMessageForThread.js.map

@@ -1 +1 @@
-{"version":3,"names":["createMainMessageForThread","message","data","text","body","id","userName","user","name","createdAt","date","imageLocation","location","imagePreview","locationPreview","mimeType","mimetype","size","duration","waveForm","attachmentId","wrappable","nftActionType","contractAddress","roomJid","nftId","JSON","stringify"],"sourceRoot":"../../../src","sources":["helpers/createMainMessageForThread.ts"],"mappings":";;AAEA,OAAO,MAAMA,0BAA0B,GAAIC,OAAiB,IAAa;EACvE,MAAMC,IAAI,GAAG;IACXC,IAAI,EAAEF,OAAO,CAACG,IAAI;IAClBC,EAAE,EAAEJ,OAAO,CAACI,EAAE;IACdC,QAAQ,EAAEL,OAAO,CAACM,IAAI,CAACC,IAAI;IAC3BC,SAAS,EAAER,OAAO,CAACS,IAAI;IACvBC,aAAa,EAAEV,OAAO,CAACW,QAAQ;IAC/BC,YAAY,EAAEZ,OAAO,CAACa,eAAe;IACrCC,QAAQ,EAAEd,OAAO,CAACe,QAAQ;IAC1BC,IAAI,EAAE,EAAE;IACRC,QAAQ,EAAE,EAAE;IACZC,QAAQ,EAAE,EAAE;IACZC,YAAY,EAAE,EAAE;IAChBC,SAAS,EAAE,EAAE;IACbC,aAAa,EAAE,EAAE;IACjBC,eAAe,EAAE,EAAE;IACnBC,OAAO,EAAEvB,OAAO,CAACuB,OAAO;IACxBC,KAAK,EAAE;EACT,CAAC;EACD,OAAOC,IAAI,CAACC,SAAS,CAACzB,IAAI,CAAC;AAC7B,CAAC","ignoreList":[]}
+{"version":3,"names":["getMessageCaption","createMainMessageForThread","message","caption","clientEncrypted","undefined","data","text","body","id","userName","user","name","createdAt","date","imageLocation","location","imagePreview","locationPreview","mimeType","mimetype","size","duration","waveForm","attachmentId","wrappable","nftActionType","contractAddress","roomJid","nftId","JSON","stringify"],"sourceRoot":"../../../src","sources":["helpers/createMainMessageForThread.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,WAAW;AAE7C,OAAO,MAAMC,0BAA0B,GAAIC,OAAiB,IAAa;EACvE;EACA;EACA,MAAMC,OAAO,GACXD,OAAO,CAACE,eAAe,KAAK,MAAM,GAAGC,SAAS,GAAGL,iBAAiB,CAACE,OAAO,CAAC;EAC7E,MAAMI,IAAI,GAAG;IACXC,IAAI,EAAEJ,OAAO,IAAID,OAAO,CAACM,IAAI;IAC7BC,EAAE,EAAEP,OAAO,CAACO,EAAE;IACdC,QAAQ,EAAER,OAAO,CAACS,IAAI,CAACC,IAAI;IAC3BC,SAAS,EAAEX,OAAO,CAACY,IAAI;IACvBC,aAAa,EAAEb,OAAO,CAACc,QAAQ;IAC/BC,YAAY,EAAEf,OAAO,CAACgB,eAAe;IACrCC,QAAQ,EAAEjB,OAAO,CAACkB,QAAQ;IAC1BC,IAAI,EAAE,EAAE;IACRC,QAAQ,EAAE,EAAE;IACZC,QAAQ,EAAE,EAAE;IACZC,YAAY,EAAE,EAAE;IAChBC,SAAS,EAAE,EAAE;IACbC,aAAa,EAAE,EAAE;IACjBC,eAAe,EAAE,EAAE;IACnBC,OAAO,EAAE1B,OAAO,CAAC0B,OAAO;IACxBC,KAAK,EAAE;EACT,CAAC;EACD,OAAOC,IAAI,CAACC,SAAS,CAACzB,IAAI,CAAC;AAC7B,CAAC","ignoreList":[]}

package/lib/module/helpers/createMessageFromXml.js

@@ -2,7 +2,8 @@
 
 import { isE2eeRoom } from '../e2ee';
 import { composeName } from './displayName';
-import { parseSealedMediaBody } from '../e2ee/sealedBody';
+import { parseSealedMediaPayload } from '../e2ee/sealedBody';
+import { normalizeMediaDataAttrs } from './mediaWireData';
 /**
  * Build an IMessage from XML.
  *
@@ -59,7 +60,9 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
     delete outerExtras.data;
   }
   const merged = {
-    ...inner,
+    // Idempotent: the wrapped path already ran it in getDataFromXml, the
+    // positional (MAM catch-up) path hands over the raw attrs.
+    ...normalizeMediaDataAttrs(inner),
     ...outerExtras,
     isDeleted: !!outerExtras?.deleted || !!arg?.isDeleted
   };
@@ -110,15 +113,26 @@ export const createMessageFromXml = async (arg, bodyEl, positionalId, positional
   const existingName = String(merged?.user?.name || '').trim();
   const resolvedName = existingName || composed || fullName || senderLocal || merged?.user?.id || '';
   const unencrypted = merged.omemoEncrypted !== 'true' && isE2eeRoom(String(merged.roomJid || ''));
-  const sealedKeys = merged.clientEncrypted === 'true' ? parseSealedMediaBody(merged.body) : undefined;
+
+  // A sealed media body is `{v:1,keys,caption?,captionMentions?}`. The keys
+  // and the caption are lifted next to each other; the caption is the only
+  // one a sealed message may show (any open caption attribute was dropped
+  // by normalizeMediaDataAttrs).
+  const sealed = merged.clientEncrypted === 'true' ? parseSealedMediaPayload(merged.body) : undefined;
   const message = {
     ...merged,
     ...(unencrypted ? {
       unencrypted: true
     } : {}),
-    ...(sealedKeys ? {
-      e2eeKeys: sealedKeys,
-      body: 'media'
+    ...(sealed ? {
+      e2eeKeys: sealed.keys,
+      body: 'media',
+      ...(sealed.caption ? {
+        caption: sealed.caption
+      } : {}),
+      ...(sealed.captionMentions ? {
+        captionMentions: sealed.captionMentions
+      } : {})
     } : {}),
     user: {
       ...(merged.user || {}),

package/lib/module/helpers/createMessageFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["isE2eeRoom","composeName","parseSealedMediaBody","createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderBare","senderResource","includes","senderIsOccupant","test","senderLocal","fromResource","composed","existingName","resolvedName","unencrypted","omemoEncrypted","sealedKeys","clientEncrypted","message","e2eeKeys"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isE2eeRoom","composeName","parseSealedMediaPayload","normalizeMediaDataAttrs","createMessageFromXml","arg","bodyEl","positionalId","positionalFrom","positionalDeleted","console","log","id","body","date","user","name","roomJid","isPositional","undefined","inner","outerExtras","bodyText","getText","text","split","xmppFrom","deleted","data","merged","isDeleted","numericPart","exec","String","Date","slice","toISOString","now","firstName","senderFirstName","toString","trim","lastName","senderLastName","fullName","senderJID","senderBare","senderResource","includes","senderIsOccupant","test","senderLocal","fromResource","composed","existingName","resolvedName","unencrypted","omemoEncrypted","sealed","clientEncrypted","message","e2eeKeys","keys","caption","captionMentions"],"sourceRoot":"../../../src","sources":["helpers/createMessageFromXml.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/fileKind.js

@@ -0,0 +1,34 @@
+"use strict";
+
+import { filenameFromUrl, isLikelyAudio } from './mimeToExtension';
+/**
+ * Which card a file gets in a bubble. Mirrors the branches MediaMessage has
+ * always used for a single file (image, video, audio, octet-stream as a voice
+ * note, then the voice-message heuristics) so an album, a card stack and a
+ * lone file all agree on what a given file is.
+ */
+export const getFileKind = input => {
+  const mime = (input.mimetype || '').toLowerCase();
+  if (mime.startsWith('image/')) {
+    return 'image';
+  }
+  if (mime.startsWith('video/')) {
+    return 'video';
+  }
+  if (mime.startsWith('audio/')) {
+    return 'audio';
+  }
+  if (mime.includes('application/octet-stream')) {
+    return 'audio';
+  }
+  const name = input.name || filenameFromUrl(input.url);
+  return isLikelyAudio(mime, name, input.url, {
+    duration: input.duration,
+    waveForm: input.waveForm,
+    originalName: input.originalName
+  }) ? 'audio' : 'file';
+};
+
+/** True for the kinds that sit in the picture/video album. */
+export const isAlbumKind = kind => kind === 'image' || kind === 'video';
+//# sourceMappingURL=fileKind.js.map

package/lib/module/helpers/fileKind.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["filenameFromUrl","isLikelyAudio","getFileKind","input","mime","mimetype","toLowerCase","startsWith","includes","name","url","duration","waveForm","originalName","isAlbumKind","kind"],"sourceRoot":"../../../src","sources":["helpers/fileKind.ts"],"mappings":";;AAAA,SAASA,eAAe,EAAEC,aAAa,QAAQ,mBAAmB;AAalE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GAAIC,KAAoB,IAAe;EAC7D,MAAMC,IAAI,GAAG,CAACD,KAAK,CAACE,QAAQ,IAAI,EAAE,EAAEC,WAAW,CAAC,CAAC;EACjD,IAAIF,IAAI,CAACG,UAAU,CAAC,QAAQ,CAAC,EAAE;IAAC,OAAO,OAAO;EAAC;EAC/C,IAAIH,IAAI,CAACG,UAAU,CAAC,QAAQ,CAAC,EAAE;IAAC,OAAO,OAAO;EAAC;EAC/C,IAAIH,IAAI,CAACG,UAAU,CAAC,QAAQ,CAAC,EAAE;IAAC,OAAO,OAAO;EAAC;EAC/C,IAAIH,IAAI,CAACI,QAAQ,CAAC,0BAA0B,CAAC,EAAE;IAAC,OAAO,OAAO;EAAC;EAC/D,MAAMC,IAAI,GAAGN,KAAK,CAACM,IAAI,IAAIT,eAAe,CAACG,KAAK,CAACO,GAAG,CAAC;EACrD,OAAOT,aAAa,CAACG,IAAI,EAAEK,IAAI,EAAEN,KAAK,CAACO,GAAG,EAAE;IAC1CC,QAAQ,EAAER,KAAK,CAACQ,QAAQ;IACxBC,QAAQ,EAAET,KAAK,CAACS,QAAQ;IACxBC,YAAY,EAAEV,KAAK,CAACU;EACtB,CAAC,CAAC,GACE,OAAO,GACP,MAAM;AACZ,CAAC;;AAED;AACA,OAAO,MAAMC,WAAW,GAAIC,IAAc,IACxCA,IAAI,KAAK,OAAO,IAAIA,IAAI,KAAK,OAAO","ignoreList":[]}

package/lib/module/helpers/getDataFromXml.js

@@ -2,6 +2,7 @@
 
 import { transformArrayToObject } from './transformTranslatations';
 import { normalizeXmppUsername } from './xmppUsername';
+import { normalizeMediaDataAttrs } from './mediaWireData';
 const getLocalpartFromJid = jid => {
   const value = String(jid || '').trim();
   if (!value) {
@@ -74,7 +75,11 @@ export const getDataFromXml = async stanza => {
     id: userWallet,
     photoURL
   };
-  const dataAttrs = data?.attrs || {};
+
+  // `attachments` and `caption` ride on <data> as strings; decode them here
+  // so every consumer sees the typed values (sealed captions are lifted from
+  // the encrypted body later, see createMessageFromXml).
+  const dataAttrs = normalizeMediaDataAttrs(data?.attrs || {});
   return {
     data: dataAttrs,
     id,

package/lib/module/helpers/getDataFromXml.js.map

@@ -1 +1 @@
-{"version":3,"names":["transformArrayToObject","normalizeXmppUsername","getLocalpartFromJid","jid","value","String","trim","undefined","split","safeJsonParse","fallback","JSON","parse","normalizeTranslations","Array","isArray","filter","item","translatedText","language","languageName","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","userWalletFromResource","Date","now","body","getText","deleted","translationPayload","translations","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","rawUserWallet","senderJID","userWallet","user","dataAttrs"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["transformArrayToObject","normalizeXmppUsername","normalizeMediaDataAttrs","getLocalpartFromJid","jid","value","String","trim","undefined","split","safeJsonParse","fallback","JSON","parse","normalizeTranslations","Array","isArray","filter","item","translatedText","language","languageName","extractTimestamp","str","stanza","console","log","toString","timestamp","slice","getDataFromXml","fullData","getChild","xmppId","attrs","id","xmppFrom","from","roomJid","userWalletFromResource","Date","now","body","getText","deleted","translationPayload","translations","translates","langSource","source","numericPart","exec","date","toISOString","data","photoURL","photo","rawUserWallet","senderJID","userWallet","user","dataAttrs"],"sourceRoot":"../../../src","sources":["helpers/getDataFromXml.ts"],"mappings":";;AAEA,SAASA,sBAAsB,QAAQ,2BAA2B;AAClE,SAASC,qBAAqB,QAAQ,gBAAgB;AACtD,SAASC,uBAAuB,QAAQ,iBAAiB;AAEzD,MAAMC,mBAAmB,GAAIC,GAAY,IAAyB;EAChE,MAAMC,KAAK,GAAGC,MAAM,CAACF,GAAG,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACtC,IAAI,CAACF,KAAK,EAAE;IAAC,OAAOG,SAAS;EAAC;EAC9B,OAAOH,KAAK,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAID,SAAS;AACzC,CAAC;;AAED;AACA;AACA;AACA,MAAME,aAAa,GAAGA,CAAKL,KAAc,EAAEM,QAAW,KAAQ;EAC5D,IAAI,OAAON,KAAK,KAAK,QAAQ,IAAI,CAACA,KAAK,EAAE;IAAC,OAAOM,QAAQ;EAAC;EAC1D,IAAI;IACF,OAAOC,IAAI,CAACC,KAAK,CAACR,KAAK,CAAC;EAC1B,CAAC,CAAC,MAAM;IACN,OAAOM,QAAQ;EACjB;AACF,CAAC;;AAED;AACA;AACA,MAAMG,qBAAqB,GAAIT,KAAc,IAC3CU,KAAK,CAACC,OAAO,CAACX,KAAK,CAAC,GAChBA,KAAK,CAACY,MAAM,CAERC,IAAI,IAMJ,CAAC,CAACA,IAAI,IACN,OAAOA,IAAI,KAAK,QAAQ,IACxB,OAAQA,IAAI,CAASC,cAAc,KAAK,QAAQ,IAChD,OAAQD,IAAI,CAASE,QAAQ,KAAK,QAAQ,IAC1C,OAAQF,IAAI,CAASG,YAAY,KAAK,QAC1C,CAAC,GACD,EAAE;AAER,MAAMC,gBAAgB,GAAGA,CAACC,GAAW,EAAEC,MAAY,KAAoB;EACrE,IAAI,CAACD,GAAG,EAAE;IAAC,OAAO,IAAI;EAAC;EACvB,IAAI,OAAOA,GAAG,KAAK,QAAQ,EAAE;IAC3BE,OAAO,CAACC,GAAG,CAACH,GAAG,EAAEC,MAAM,CAACG,QAAQ,CAAC,CAAC,CAAC;IACnC,OAAO,IAAI;EACb;EACA,MAAMC,SAAS,GAAGL,GAAG,CAACM,KAAK,CAAC,CAAC,EAAE,CAAC;EAChC,OAAOD,SAAS;AAClB,CAAC;AAeD,OAAO,MAAME,cAAc,GAAG,MAAON,MAAe,IAAmC;EACrF,MAAMO,QAAQ,GACZP,MAAM,CAACQ,QAAQ,CAAC,QAAQ,CAAC,EAAEA,QAAQ,CAAC,WAAW,CAAC,EAAEA,QAAQ,CAAC,SAAS,CAAC,IACrER,MAAM;EAER,MAAMS,MAAM,GAAGF,QAAQ,EAAEG,KAAK,CAACC,EAAE;EACjC,MAAMC,QAAQ,GAAGL,QAAQ,EAAEG,KAAK,EAAEG,IAAI;EACtC,MAAM,CAACC,OAAO,EAAEC,sBAAsB,CAAC,GAAG,CAACH,QAAQ,IAAI,EAAE,EAAE3B,KAAK,CAAC,GAAG,CAAC;EACrE,IAAI0B,EAAE,GACJX,MAAM,CAACQ,QAAQ,CAAC,QAAQ,CAAC,EAAEE,KAAK,CAACC,EAAE,IACnCb,gBAAgB,CAACE,MAAM,EAAEQ,QAAQ,CAAC,WAAW,CAAC,EAAEE,KAAK,EAAEC,EAAE,EAAEX,MAAM,CAAC;EAEpE,IAAI,CAACW,EAAE,EAAE;IACPA,EAAE,GAAGF,MAAM,IAAIO,IAAI,CAACC,GAAG,CAAC,CAAC,CAACd,QAAQ,CAAC,CAAC;EACtC;EAEA,MAAMe,IAAI,GAAGX,QAAQ,EAAEC,QAAQ,CAAC,MAAM,CAAC,EAAEW,OAAO,CAAC,CAAC,IAAInC,SAAS;EAC/D,MAAMoC,OAAO,GAAG,CAAC,CAACb,QAAQ,EAAEC,QAAQ,CAAC,SAAS,CAAC;EAC/C,MAAMa,kBAAkB,GAAGnC,aAAa,CACtCqB,QAAQ,EAAEC,QAAQ,CAAC,cAAc,CAAC,EAAEE,KAAK,EAAE7B,KAAK,EAChD,CAAC,CACH,CAAC;EACD,MAAMyC,YAAY,GAAGf,QAAQ,EAAEC,QAAQ,CAAC,cAAc,CAAC,EAAEE,KAAK,EAAE7B,KAAK,GACjEL,sBAAsB,CAACc,qBAAqB,CAAC+B,kBAAkB,CAACE,UAAU,CAAC,CAAC,GAC5EvC,SAAS;EACb,MAAMwC,UAAU,GAAGjB,QAAQ,EAAEC,QAAQ,CAAC,WAAW,CAAC,EAAEE,KAAK,EAAEe,MAE9C;EACb,MAAMC,WAAW,GAAG,SAAS,CAACC,IAAI,CAAChB,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;EACjD,MAAMiB,IAAI,GAAGF,WAAW,GACpB,IAAIV,IAAI,CAAC,CAACU,WAAW,CAACrB,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAACwB,WAAW,CAAC,CAAC,GACjD,IAAIb,IAAI,CAAC,CAAC,CAACa,WAAW,CAAC,CAAC;EAE5B,MAAMC,IAAI,GAAGvB,QAAQ,EAAEC,QAAQ,CAAC,MAAM,CAAC,IAAIR,MAAM,EAAEQ,QAAQ,CAAC,MAAM,CAAC;EACnE,MAAMuB,QAAQ,GAAGD,IAAI,EAAEpB,KAAK,EAAEsB,KAAK;;EAEnC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMC,aAAa,GACjBlB,sBAAsB,IACtBpC,mBAAmB,CAACmD,IAAI,EAAEpB,KAAK,EAAEwB,SAAS,CAAC,IAC3ClD,SAAS;EACX,MAAMmD,UAAU,GAAG1D,qBAAqB,CAACwD,aAAa,CAAC,IAAIA,aAAa;EAExE,MAAMG,IAAI,GAAG;IACXzB,EAAE,EAAEwB,UAAU;IACdJ;EACF,CAAQ;;EAER;EACA;EACA;EACA,MAAMM,SAAS,GAAG3D,uBAAuB,CAACoD,IAAI,EAAEpB,KAAK,IAAI,CAAC,CAAC,CAAC;EAE5D,OAAO;IACLoB,IAAI,EAAEO,SAAS;IACf1B,EAAE;IACFO,IAAI;IACJJ,OAAO;IACPc,IAAI;IACJQ,IAAI;IACJhB,OAAO;IACPE,YAAY;IACZE,UAAU;IACVf,MAAM;IACNG;EACF,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/module/helpers/mapWithConcurrency.js

@@ -0,0 +1,37 @@
+"use strict";
+
+/**
+ * Runs `worker` over `items` with at most `limit` calls in flight, and
+ * resolves with the results in INPUT order, whatever order the calls finish
+ * in. Workers that throw are reported as rejected entries instead of
+ * aborting the rest of the batch, so one failed upload never stops its
+ * siblings.
+ */
+export async function mapWithConcurrency(items, limit, worker) {
+  const results = new Array(items.length);
+  const width = Math.max(1, Math.min(Math.floor(limit) || 1, items.length));
+  let next = 0;
+  const lane = async () => {
+    while (next < items.length) {
+      const index = next;
+      next += 1;
+      try {
+        const value = await worker(items[index], index);
+        results[index] = {
+          status: 'fulfilled',
+          value
+        };
+      } catch (reason) {
+        results[index] = {
+          status: 'rejected',
+          reason
+        };
+      }
+    }
+  };
+  await Promise.all(Array.from({
+    length: width
+  }, () => lane()));
+  return results;
+}
+//# sourceMappingURL=mapWithConcurrency.js.map

package/lib/module/helpers/mapWithConcurrency.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["mapWithConcurrency","items","limit","worker","results","Array","length","width","Math","max","min","floor","next","lane","index","value","status","reason","Promise","all","from"],"sourceRoot":"../../../src","sources":["helpers/mapWithConcurrency.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeA,kBAAkBA,CACtCC,KAAmB,EACnBC,KAAa,EACbC,MAA8C,EACV;EACpC,MAAMC,OAAkC,GAAG,IAAIC,KAAK,CAACJ,KAAK,CAACK,MAAM,CAAC;EAClE,MAAMC,KAAK,GAAGC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAED,IAAI,CAACE,GAAG,CAACF,IAAI,CAACG,KAAK,CAACT,KAAK,CAAC,IAAI,CAAC,EAAED,KAAK,CAACK,MAAM,CAAC,CAAC;EACzE,IAAIM,IAAI,GAAG,CAAC;EAEZ,MAAMC,IAAI,GAAG,MAAAA,CAAA,KAA2B;IACtC,OAAOD,IAAI,GAAGX,KAAK,CAACK,MAAM,EAAE;MAC1B,MAAMQ,KAAK,GAAGF,IAAI;MAClBA,IAAI,IAAI,CAAC;MACT,IAAI;QACF,MAAMG,KAAK,GAAG,MAAMZ,MAAM,CAACF,KAAK,CAACa,KAAK,CAAC,EAAGA,KAAK,CAAC;QAChDV,OAAO,CAACU,KAAK,CAAC,GAAG;UAAEE,MAAM,EAAE,WAAW;UAAED;QAAM,CAAC;MACjD,CAAC,CAAC,OAAOE,MAAM,EAAE;QACfb,OAAO,CAACU,KAAK,CAAC,GAAG;UAAEE,MAAM,EAAE,UAAU;UAAEC;QAAO,CAAC;MACjD;IACF;EACF,CAAC;EAED,MAAMC,OAAO,CAACC,GAAG,CAACd,KAAK,CAACe,IAAI,CAAC;IAAEd,MAAM,EAAEC;EAAM,CAAC,EAAE,MAAMM,IAAI,CAAC,CAAC,CAAC,CAAC;EAC9D,OAAOT,OAAO;AAChB","ignoreList":[]}

package/lib/module/helpers/mediaLimits.js

@@ -0,0 +1,27 @@
+"use strict";
+
+/** Hard client-side cap on a single upload. Mirrors the backend's body limit. */
+export const MAX_MEDIA_BYTES = 50 * 1024 * 1024;
+
+/** The most files one message may carry (also the parser-side ceiling). */
+export const MAX_MEDIA_FILES = 10;
+
+/** Files per message the host allows: `attachments.maxFiles`, clamped to 1-10. */
+export const mediaFileCap = config => {
+  const configured = Number(config?.attachments?.maxFiles);
+  if (!Number.isFinite(configured)) {
+    return MAX_MEDIA_FILES;
+  }
+  return Math.min(MAX_MEDIA_FILES, Math.max(1, Math.floor(configured)));
+};
+
+/**
+ * Bytes allowed per file: the 50 MB upload cap, lowered by
+ * `attachments.maxSizeMB` when the host sets a smaller one.
+ */
+export const mediaSizeLimit = (config, override) => {
+  const base = typeof override === 'number' && override > 0 ? Math.min(override, MAX_MEDIA_BYTES) : MAX_MEDIA_BYTES;
+  const mb = Number(config?.attachments?.maxSizeMB);
+  return Number.isFinite(mb) && mb > 0 ? Math.min(base, mb * 1024 * 1024) : base;
+};
+//# sourceMappingURL=mediaLimits.js.map

package/lib/module/helpers/mediaLimits.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MAX_MEDIA_BYTES","MAX_MEDIA_FILES","mediaFileCap","config","configured","Number","attachments","maxFiles","isFinite","Math","min","max","floor","mediaSizeLimit","override","base","mb","maxSizeMB"],"sourceRoot":"../../../src","sources":["helpers/mediaLimits.ts"],"mappings":";;AAEA;AACA,OAAO,MAAMA,eAAe,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI;;AAE/C;AACA,OAAO,MAAMC,eAAe,GAAG,EAAE;;AAEjC;AACA,OAAO,MAAMC,YAAY,GAAIC,MAA4C,IAAa;EACpF,MAAMC,UAAU,GAAGC,MAAM,CAACF,MAAM,EAAEG,WAAW,EAAEC,QAAQ,CAAC;EACxD,IAAI,CAACF,MAAM,CAACG,QAAQ,CAACJ,UAAU,CAAC,EAAE;IAAC,OAAOH,eAAe;EAAC;EAC1D,OAAOQ,IAAI,CAACC,GAAG,CAACT,eAAe,EAAEQ,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEF,IAAI,CAACG,KAAK,CAACR,UAAU,CAAC,CAAC,CAAC;AACvE,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMS,cAAc,GAAGA,CAC5BV,MAA4C,EAC5CW,QAAiB,KACN;EACX,MAAMC,IAAI,GAAG,OAAOD,QAAQ,KAAK,QAAQ,IAAIA,QAAQ,GAAG,CAAC,GAAGL,IAAI,CAACC,GAAG,CAACI,QAAQ,EAAEd,eAAe,CAAC,GAAGA,eAAe;EACjH,MAAMgB,EAAE,GAAGX,MAAM,CAACF,MAAM,EAAEG,WAAW,EAAEW,SAAS,CAAC;EACjD,OAAOZ,MAAM,CAACG,QAAQ,CAACQ,EAAE,CAAC,IAAIA,EAAE,GAAG,CAAC,GAAGP,IAAI,CAACC,GAAG,CAACK,IAAI,EAAEC,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,GAAGD,IAAI;AAChF,CAAC","ignoreList":[]}

package/lib/module/helpers/mediaSendRetry.js

@@ -0,0 +1,55 @@
+"use strict";
+
+/**
+ * Retry hooks for media messages whose uploads did not all land.
+ *
+ * The send closure lives inside useSendMessage, but the bubble that shows
+ * "Retry" on a tile is somewhere else in the tree and has no access to it.
+ * The send registers its retry runner under the message id while the
+ * message is unsent, and the bubble looks it up here. The runner is removed
+ * as soon as the message is delivered.
+ */
+
+const runners = new Map();
+export const registerMediaRetry = (messageId, runner) => {
+  runners.set(messageId, runner);
+};
+export const unregisterMediaRetry = messageId => {
+  runners.delete(messageId);
+};
+export const hasMediaRetry = messageId => runners.has(messageId);
+
+/**
+ * Re-runs the uploads still missing for `messageId` (only `index` / `indices`
+ * when given), then sends the message once every file is in. Resolves to
+ * false when nothing is registered or the attempt did not deliver.
+ */
+export const retryMediaSend = async (messageId, index) => {
+  const runner = runners.get(messageId);
+  if (!runner) {
+    return false;
+  }
+  const indices = index === undefined ? undefined : Array.isArray(index) ? index : [index];
+  return runner(indices);
+};
+const pendingRetryIndices = new Map();
+
+/**
+ * Asks for one file of `messageId` to be retried. Requests made in the same
+ * tick are merged into one run: the runner takes a single run at a time, so
+ * a separate call per tile would drop every retry after the first.
+ */
+export const requestMediaRetry = (messageId, index) => {
+  const batch = pendingRetryIndices.get(messageId);
+  if (batch) {
+    batch.add(index);
+    return;
+  }
+  const next = new Set([index]);
+  pendingRetryIndices.set(messageId, next);
+  queueMicrotask(() => {
+    pendingRetryIndices.delete(messageId);
+    retryMediaSend(messageId, [...next]).catch(() => false);
+  });
+};
+//# sourceMappingURL=mediaSendRetry.js.map

package/lib/module/helpers/mediaSendRetry.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["runners","Map","registerMediaRetry","messageId","runner","set","unregisterMediaRetry","delete","hasMediaRetry","has","retryMediaSend","index","get","indices","undefined","Array","isArray","pendingRetryIndices","requestMediaRetry","batch","add","next","Set","queueMicrotask","catch"],"sourceRoot":"../../../src","sources":["helpers/mediaSendRetry.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA,MAAMA,OAAO,GAAG,IAAIC,GAAG,CAA2B,CAAC;AAEnD,OAAO,MAAMC,kBAAkB,GAAGA,CAACC,SAAiB,EAAEC,MAAwB,KAAW;EACvFJ,OAAO,CAACK,GAAG,CAACF,SAAS,EAAEC,MAAM,CAAC;AAChC,CAAC;AAED,OAAO,MAAME,oBAAoB,GAAIH,SAAiB,IAAW;EAC/DH,OAAO,CAACO,MAAM,CAACJ,SAAS,CAAC;AAC3B,CAAC;AAED,OAAO,MAAMK,aAAa,GAAIL,SAAiB,IAAcH,OAAO,CAACS,GAAG,CAACN,SAAS,CAAC;;AAEnF;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,cAAc,GAAG,MAAAA,CAC5BP,SAAiB,EACjBQ,KAAyB,KACJ;EACrB,MAAMP,MAAM,GAAGJ,OAAO,CAACY,GAAG,CAACT,SAAS,CAAC;EACrC,IAAI,CAACC,MAAM,EAAE;IAAC,OAAO,KAAK;EAAC;EAC3B,MAAMS,OAAO,GAAGF,KAAK,KAAKG,SAAS,GAAGA,SAAS,GAAGC,KAAK,CAACC,OAAO,CAACL,KAAK,CAAC,GAAGA,KAAK,GAAG,CAACA,KAAK,CAAC;EACxF,OAAOP,MAAM,CAACS,OAAO,CAAC;AACxB,CAAC;AAED,MAAMI,mBAAmB,GAAG,IAAIhB,GAAG,CAAsB,CAAC;;AAE1D;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMiB,iBAAiB,GAAGA,CAACf,SAAiB,EAAEQ,KAAa,KAAW;EAC3E,MAAMQ,KAAK,GAAGF,mBAAmB,CAACL,GAAG,CAACT,SAAS,CAAC;EAChD,IAAIgB,KAAK,EAAE;IACTA,KAAK,CAACC,GAAG,CAACT,KAAK,CAAC;IAChB;EACF;EACA,MAAMU,IAAI,GAAG,IAAIC,GAAG,CAAS,CAACX,KAAK,CAAC,CAAC;EACrCM,mBAAmB,CAACZ,GAAG,CAACF,SAAS,EAAEkB,IAAI,CAAC;EACxCE,cAAc,CAAC,MAAM;IACnBN,mBAAmB,CAACV,MAAM,CAACJ,SAAS,CAAC;IACrCO,cAAc,CAACP,SAAS,EAAE,CAAC,GAAGkB,IAAI,CAAC,CAAC,CAACG,KAAK,CAAC,MAAM,KAAK,CAAC;EACzD,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/helpers/mediaWireData.js

@@ -0,0 +1,58 @@
+"use strict";
+
+import { parseAttachments } from './attachments';
+import { getMessageCaption, normalizeCaptionMentions } from './caption';
+
+/**
+ * Normalises the media parts of a message's flat `<data>` attributes:
+ *
+ *  - `attachments` (a JSON string on the wire) becomes the typed array, or is
+ *    dropped when it decodes to nothing so the flat legacy fields win;
+ *  - `caption` is kept only when it holds text, with `captionMentions` (JSON
+ *    on the wire) checked against it;
+ *  - in a sealed message (`clientEncrypted`) the caption attributes are
+ *    always dropped: the only caption such a message may show is the one
+ *    inside its encrypted body, which the caller lifts afterwards.
+ *
+ * Safe to apply twice, so the wrapped and the positional parsers can both
+ * call it.
+ */
+export const normalizeMediaDataAttrs = attrs => {
+  const out = {
+    ...attrs
+  };
+  if ('attachments' in out) {
+    const attachments = parseAttachments(out.attachments);
+    if (attachments.length > 0) {
+      out.attachments = attachments;
+    } else {
+      delete out.attachments;
+    }
+  }
+  if (out.clientEncrypted === 'true') {
+    delete out.caption;
+    delete out.captionMentions;
+    return out;
+  }
+  if ('caption' in out) {
+    const caption = getMessageCaption({
+      caption: out.caption
+    });
+    if (caption) {
+      out.caption = caption;
+      const spans = normalizeCaptionMentions(out.captionMentions, caption);
+      if (spans) {
+        out.captionMentions = spans;
+      } else {
+        delete out.captionMentions;
+      }
+    } else {
+      delete out.caption;
+      delete out.captionMentions;
+    }
+  } else if ('captionMentions' in out) {
+    delete out.captionMentions;
+  }
+  return out;
+};
+//# sourceMappingURL=mediaWireData.js.map

package/lib/module/helpers/mediaWireData.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["parseAttachments","getMessageCaption","normalizeCaptionMentions","normalizeMediaDataAttrs","attrs","out","attachments","length","clientEncrypted","caption","captionMentions","spans"],"sourceRoot":"../../../src","sources":["helpers/mediaWireData.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAQ,eAAe;AAChD,SAASC,iBAAiB,EAAEC,wBAAwB,QAAQ,WAAW;;AAEvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAClCC,KAA0B,IACF;EACxB,MAAMC,GAAwB,GAAG;IAAE,GAAGD;EAAM,CAAC;EAE7C,IAAI,aAAa,IAAIC,GAAG,EAAE;IACxB,MAAMC,WAAW,GAAGN,gBAAgB,CAACK,GAAG,CAACC,WAAW,CAAC;IACrD,IAAIA,WAAW,CAACC,MAAM,GAAG,CAAC,EAAE;MAC1BF,GAAG,CAACC,WAAW,GAAGA,WAAW;IAC/B,CAAC,MAAM;MACL,OAAOD,GAAG,CAACC,WAAW;IACxB;EACF;EAEA,IAAID,GAAG,CAACG,eAAe,KAAK,MAAM,EAAE;IAClC,OAAOH,GAAG,CAACI,OAAO;IAClB,OAAOJ,GAAG,CAACK,eAAe;IAC1B,OAAOL,GAAG;EACZ;EAEA,IAAI,SAAS,IAAIA,GAAG,EAAE;IACpB,MAAMI,OAAO,GAAGR,iBAAiB,CAAC;MAAEQ,OAAO,EAAEJ,GAAG,CAACI;IAAQ,CAAC,CAAC;IAC3D,IAAIA,OAAO,EAAE;MACXJ,GAAG,CAACI,OAAO,GAAGA,OAAO;MACrB,MAAME,KAAK,GAAGT,wBAAwB,CAACG,GAAG,CAACK,eAAe,EAAED,OAAO,CAAC;MACpE,IAAIE,KAAK,EAAE;QACTN,GAAG,CAACK,eAAe,GAAGC,KAAK;MAC7B,CAAC,MAAM;QACL,OAAON,GAAG,CAACK,eAAe;MAC5B;IACF,CAAC,MAAM;MACL,OAAOL,GAAG,CAACI,OAAO;MAClB,OAAOJ,GAAG,CAACK,eAAe;IAC5B;EACF,CAAC,MAAM,IAAI,iBAAiB,IAAIL,GAAG,EAAE;IACnC,OAAOA,GAAG,CAACK,eAAe;EAC5B;EAEA,OAAOL,GAAG;AACZ,CAAC","ignoreList":[]}

package/lib/module/helpers/mentionSpans.js

@@ -0,0 +1,14 @@
+"use strict";
+
+/**
+ * Keeps only the spans that still read "@Name" at their offset in `text`.
+ * RN does not render mentions; a caption's spans are stored (and checked) so
+ * they survive a round trip to a client that does.
+ */
+export const validateMentionSpans = (text, spans) => spans.filter(span => {
+  if (span.offset < 0 || span.offset + span.length > text.length) {
+    return false;
+  }
+  return text.slice(span.offset, span.offset + span.length) === `@${span.name}`;
+});
+//# sourceMappingURL=mentionSpans.js.map

package/lib/module/helpers/mentionSpans.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["validateMentionSpans","text","spans","filter","span","offset","length","slice","name"],"sourceRoot":"../../../src","sources":["helpers/mentionSpans.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,oBAAoB,GAAGA,CAClCC,IAAY,EACZC,KAAqB,KAErBA,KAAK,CAACC,MAAM,CAAEC,IAAI,IAAK;EACrB,IAAIA,IAAI,CAACC,MAAM,GAAG,CAAC,IAAID,IAAI,CAACC,MAAM,GAAGD,IAAI,CAACE,MAAM,GAAGL,IAAI,CAACK,MAAM,EAAE;IAC9D,OAAO,KAAK;EACd;EACA,OAAOL,IAAI,CAACM,KAAK,CAACH,IAAI,CAACC,MAAM,EAAED,IAAI,CAACC,MAAM,GAAGD,IAAI,CAACE,MAAM,CAAC,KAAK,IAAIF,IAAI,CAACI,IAAI,EAAE;AAC/E,CAAC,CAAC","ignoreList":[]}