@ethora/chat-component-rn 26.10.5 → 26.10.7

package/lib/module/helpers/attachments.js

@@ -0,0 +1,245 @@
+"use strict";
+
+import { safeJsonParse } from './safeJson';
+import { repairFilenameEncoding } from './repairFilenameEncoding';
+import { inferMimeFromName, isGenericMime } from './mimeToExtension';
+
+/** Parses a dimension that may arrive as a number or a numeric string. */
+const parseDimension = value => {
+  const n = typeof value === 'string' ? Number.parseFloat(value) : value;
+  return typeof n === 'number' && Number.isFinite(n) && n > 0 ? n : undefined;
+};
+
+/**
+ * Hard ceiling on how many attachments we will serialise into a stanza.
+ * The composer caps the picker far below this; this is the parser-side
+ * guard so a malformed or hostile stanza cannot make us render an
+ * unbounded grid.
+ */
+export const MAX_ATTACHMENTS_PER_MESSAGE = 10;
+const asOptionalString = value => {
+  if (value === null || value === undefined) return undefined;
+  if (typeof value === 'string') return value || undefined;
+  if (typeof value === 'number') return String(value);
+  return undefined;
+};
+
+/** A file name from the wire/API, with UTF-8-read-as-Latin-1 mojibake undone. */
+const asOptionalFileName = value => {
+  const name = asOptionalString(value);
+  return name === undefined ? undefined : repairFilenameEncoding(name);
+};
+const asOptionalBoolean = value => {
+  if (typeof value === 'boolean') return value;
+  if (value === 'true') return true;
+  if (value === 'false') return false;
+  return undefined;
+};
+
+/**
+ * Turns one raw wire/API object into an `IAttachment`, or null when there is
+ * nothing renderable in it. `location` is allowed to be empty: that is what
+ * an optimistic (still-uploading) attachment looks like.
+ */
+export const normalizeAttachment = raw => {
+  if (!raw || typeof raw !== 'object') return null;
+  const source = raw;
+  const location = asOptionalString(source.location) ?? '';
+  const originalName = asOptionalFileName(source.originalName) ?? asOptionalFileName(source.originalname);
+  const rawMimetype = asOptionalString(source.mimetype);
+  const fileName = asOptionalFileName(source.fileName) ?? asOptionalFileName(source.filename);
+  const duration = asOptionalString(source.duration) ?? asOptionalString(source.mediaDuration);
+  const mimetype = resolveLegacyMimetype(rawMimetype, {
+    names: [originalName, fileName, urlPath(location)],
+    duration
+  });
+  if (!location && !originalName && !mimetype && !fileName) {
+    return null;
+  }
+  return {
+    attachmentId: asOptionalString(source.attachmentId) ?? asOptionalString(source._id),
+    location,
+    locationPreview: asOptionalString(source.locationPreview),
+    mimetype,
+    originalName,
+    fileName,
+    size: asOptionalString(source.size),
+    duration,
+    ...optionalDimensions(source),
+    ownerKey: asOptionalString(source.ownerKey),
+    userId: asOptionalString(source.userId),
+    createdAt: asOptionalString(source.createdAt),
+    updatedAt: asOptionalString(source.updatedAt),
+    expiresAt: asOptionalString(source.expiresAt),
+    isVisible: asOptionalBoolean(source.isVisible),
+    isPrivate: asOptionalBoolean(source.isPrivate),
+    ...normalizeUploadState(source)
+  };
+};
+
+/** The path part of a URL (no query or fragment), for reading an extension off it. */
+const urlPath = url => url ? url.split(/[?#]/)[0] : undefined;
+
+/**
+ * Older clients and the storage send media with no `mimetype`, or with the
+ * "could not sniff" `application/octet-stream`. The extension of any name the
+ * file carries tells which picture, video, audio or PDF it is. A nameless or
+ * extensionless file with a duration is a recorded voice note (browsers upload
+ * those as a `blob`), which is exactly what octet-stream renders as.
+ */
+const resolveLegacyMimetype = (mimetype, hints) => {
+  if (!isGenericMime(mimetype)) return mimetype;
+  const hasDuration = Number.parseFloat(hints.duration ?? '') > 0;
+  // A recorded note keeps its generic type: browsers upload it as a nameless
+  // `blob` (and storage may add a `.webm` to the stored name, which is audio
+  // here, not video). Only a name that says what it is overrides that.
+  if (hasDuration && !inferMimeFromName(hints.names[0])) return mimetype ?? 'application/octet-stream';
+  for (const name of hints.names) {
+    const inferred = inferMimeFromName(name);
+    if (inferred) return inferred;
+  }
+  return mimetype;
+};
+
+/** Pixel size, only when the source carries a usable one. */
+const optionalDimensions = source => {
+  const width = parseDimension(source.width);
+  const height = parseDimension(source.height);
+  return {
+    ...(width !== undefined ? {
+      width
+    } : {}),
+    ...(height !== undefined ? {
+      height
+    } : {})
+  };
+};
+
+/**
+ * Local upload state rides along on optimistic attachments only; it is
+ * never serialised, so a received attachment never carries it.
+ */
+const normalizeUploadState = source => {
+  const status = source.uploadStatus === 'uploading' || source.uploadStatus === 'failed' ? source.uploadStatus : undefined;
+  if (!status) return {};
+  const progress = typeof source.uploadProgress === 'number' && Number.isFinite(source.uploadProgress) ? Math.min(100, Math.max(0, source.uploadProgress)) : 0;
+  // Only a file on this device can be the local preview of an outgoing file.
+  const localUrl = typeof source.localUrl === 'string' && /^(file|content):\/\//.test(source.localUrl) ? source.localUrl : undefined;
+  return {
+    uploadStatus: status,
+    uploadProgress: progress,
+    ...(localUrl ? {
+      localUrl
+    } : {})
+  };
+};
+
+/** Accepts the parsed array, the raw JSON string, or junk. Never throws. */
+export const parseAttachments = raw => {
+  const candidate = typeof raw === 'string' ? safeJsonParse(raw, []) : raw;
+  if (!Array.isArray(candidate)) return [];
+  return candidate.slice(0, MAX_ATTACHMENTS_PER_MESSAGE).map(normalizeAttachment).filter(item => item !== null);
+};
+
+/**
+ * The wire form: a JSON string on the `<data attachments="...">` attribute.
+ * Only the fields a receiver renders are sent - the stanza is already wide
+ * and every byte here is duplicated per attachment.
+ */
+export const serializeAttachments = attachments => JSON.stringify(attachments.slice(0, MAX_ATTACHMENTS_PER_MESSAGE).map(attachment => ({
+  attachmentId: attachment.attachmentId,
+  location: attachment.location,
+  locationPreview: attachment.locationPreview,
+  mimetype: attachment.mimetype,
+  originalName: attachment.originalName,
+  fileName: attachment.fileName,
+  size: attachment.size,
+  duration: attachment.duration
+})));
+
+/**
+ * The only supported way to read a media message's files.
+ *
+ * Order of truth: the multi-attach payload when present, otherwise the flat
+ * legacy fields synthesised into a single attachment. Every message that
+ * predates this feature - and every message from a client that does not
+ * speak it - takes the second path.
+ */
+export const getMessageAttachments = message => {
+  if (!message) return [];
+  const parsed = parseAttachments(message.attachments);
+  if (parsed.length > 0) return parsed;
+
+  // Legacy clients may pack several files into the flat fields as a
+  // comma separated list of URLs; the other flat fields then list one value
+  // each, in the same order, or one value for all.
+  const locations = splitUrlList(message.location);
+  if (locations.length > 1) {
+    const previews = splitUrlList(message.locationPreview);
+    const mimetypes = splitList(message.mimetype);
+    const names = splitList(message.originalName);
+    return locations.slice(0, MAX_ATTACHMENTS_PER_MESSAGE).map((location, index) => normalizeAttachment({
+      location,
+      locationPreview: previews.length === locations.length ? previews[index] : undefined,
+      mimetype: pickNth(mimetypes, index, locations.length),
+      originalName: pickNth(names, index, locations.length),
+      size: undefined
+    })).filter(item => item !== null);
+  }
+  const legacy = normalizeAttachment({
+    location: message.location,
+    locationPreview: message.locationPreview,
+    mimetype: message.mimetype,
+    originalName: message.originalName,
+    fileName: message.fileName,
+    size: message.size,
+    duration: message.duration,
+    mediaDuration: message.mediaDuration
+  });
+  return legacy ? [legacy] : [];
+};
+
+/** "https://a/x.jpg, https://a/y.jpg" -> two URLs. A single URL stays whole, commas and all. */
+const splitUrlList = value => typeof value === 'string' && /,\s*https?:\/\//i.test(value) ? value.split(/,\s*(?=https?:\/\/)/i).map(item => item.trim()).filter(Boolean) : typeof value === 'string' && value ? [value] : [];
+const splitList = value => typeof value === 'string' && value ? value.split(',').map(item => item.trim()) : [];
+
+/** The nth entry of a parallel list, or its only entry when it is shared by all. */
+const pickNth = (list, index, total) => list.length === total ? list[index] : list.length === 1 ? list[0] : undefined;
+
+/**
+ * True when the message carries a file: flagged `isMediafile`, or (older
+ * senders that never set the flag) with a real file URL or attachment. The
+ * one test every surface uses for "is this a media bubble".
+ */
+export const isMediaMessage = message => {
+  if (!message || message.isDeleted) return false;
+  if (String(message.isMediafile) === 'true') return true;
+  return getMessageAttachments(message).some(attachment => Boolean(attachment.location));
+};
+
+/**
+ * Maps one object from POST /files/ `results` to the attachment a sent
+ * message carries. Field names here follow the API's own spelling
+ * (`originalname`, `filename`), not the wire attribute names.
+ */
+export const toUploadedAttachment = raw => ({
+  attachmentId: raw?._id,
+  location: raw?.location,
+  locationPreview: raw?.locationPreview,
+  mimetype: raw?.mimetype,
+  originalName: typeof raw?.originalname === 'string' ? repairFilenameEncoding(raw.originalname) : raw?.originalname,
+  fileName: typeof raw?.filename === 'string' ? repairFilenameEncoding(raw.filename) : raw?.filename,
+  size: raw?.size?.toString?.() ?? raw?.size,
+  duration: raw?.duration,
+  ownerKey: raw?.ownerKey,
+  userId: raw?.userId,
+  createdAt: raw?.createdAt,
+  updatedAt: raw?.updatedAt,
+  expiresAt: raw?.expiresAt,
+  isVisible: raw?.isVisible,
+  isPrivate: raw?.isPrivate
+});
+
+/** Name to show for an attachment, with the URL tail as the last resort. */
+export const getAttachmentName = attachment => attachment.originalName || attachment.fileName || attachment.location?.split('/')?.pop() || 'MediaFile';
+//# sourceMappingURL=attachments.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["safeJsonParse","repairFilenameEncoding","inferMimeFromName","isGenericMime","parseDimension","value","n","Number","parseFloat","isFinite","undefined","MAX_ATTACHMENTS_PER_MESSAGE","asOptionalString","String","asOptionalFileName","name","asOptionalBoolean","normalizeAttachment","raw","source","location","originalName","originalname","rawMimetype","mimetype","fileName","filename","duration","mediaDuration","resolveLegacyMimetype","names","urlPath","attachmentId","_id","locationPreview","size","optionalDimensions","ownerKey","userId","createdAt","updatedAt","expiresAt","isVisible","isPrivate","normalizeUploadState","url","split","hints","hasDuration","inferred","width","height","status","uploadStatus","progress","uploadProgress","Math","min","max","localUrl","test","parseAttachments","candidate","Array","isArray","slice","map","filter","item","serializeAttachments","attachments","JSON","stringify","attachment","getMessageAttachments","message","parsed","length","locations","splitUrlList","previews","mimetypes","splitList","index","pickNth","legacy","trim","Boolean","list","total","isMediaMessage","isDeleted","isMediafile","some","toUploadedAttachment","toString","getAttachmentName","pop"],"sourceRoot":"../../../src","sources":["helpers/attachments.ts"],"mappings":"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","ignoreList":[]}

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":";;AACA,SAASA,UAAU,QAAQ,SAAS;AACpC,SAASC,WAAW,QAAQ,eAAe;AAC3C,SAASC,oBAAoB,QAAQ,oBAAoB;AAMzD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAG,MAAAA,CAClCC,GAAwB,EACxBC,MAAY,EACZC,YAAqB,EACrBC,cAAuB,EACvBC,iBAA2B,KACL;EACtB,IAAI,CAACJ,GAAG,EAAE;IACRK,OAAO,CAACC,GAAG,CAAC,wCAAwC,CAAC;IACrD;IACA;IACA,OAAO;MAAEC,EAAE,EAAE,EAAE;MAAEC,IAAI,EAAE,EAAE;MAAEC,IAAI,EAAE,EAAE;MAAEC,IAAI,EAAE;QAAEH,EAAE,EAAE,EAAE;QAAEI,IAAI,EAAE;MAAG,CAAQ;MAAEC,OAAO,EAAE;IAAG,CAAC;EACvF;;EAEA;EACA;EACA;EACA,MAAMC,YAAY,GAAGZ,MAAM,KAAKa,SAAS,IAAIZ,YAAY,KAAKY,SAAS;EAEvE,IAAIC,KAAU,CAAC,CAAC;EAChB,IAAIC,WAAgB,GAAG,CAAC,CAAC;EAEzB,IAAIH,YAAY,EAAE;IAChBE,KAAK,GAAGf,GAAG,CAAC,CAAC;IACb,MAAMiB,QAAQ,GACZ,OAAOhB,MAAM,KAAK,QAAQ,GACtBA,MAAM,GACNA,MAAM,EAAEiB,OAAO,GACbjB,MAAM,CAACiB,OAAO,CAAC,CAAC,GAChBjB,MAAM,EAAEkB,IAAI;IACpBH,WAAW,GAAG;MACZT,EAAE,EAAEL,YAAY;MAChBM,IAAI,EAAES,QAAQ;MACdL,OAAO,EAAE,CAACT,cAAc,IAAI,EAAE,EAAEiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;MAC7CC,QAAQ,EAAElB,cAAc;MACxBmB,OAAO,EAAE,CAAC,CAAClB;IACb,CAAC;EACH,CAAC,MAAM;IACLW,KAAK,GAAGf,GAAG,EAAEuB,IAAI,IAAI,CAAC,CAAC;IACvBP,WAAW,GAAG;MAAE,GAAGhB;IAAI,CAAC;IACxB,OAAOgB,WAAW,CAACO,IAAI;EACzB;EAEA,MAAMC,MAAW,GAAG;IAClB,GAAGT,KAAK;IACR,GAAGC,WAAW;IACdS,SAAS,EAAE,CAAC,CAACT,WAAW,EAAEM,OAAO,IAAI,CAAC,CAAEtB,GAAG,EAAUyB;EACvD,CAAC;;EAED;EACA;EACA;EACA;EACA;EACA,IAAI,CAACD,MAAM,CAACf,IAAI,EAAE;IAChB,MAAMiB,WAAW,GAAG,SAAS,CAACC,IAAI,CAACC,MAAM,CAACJ,MAAM,CAACjB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAChEiB,MAAM,CAACf,IAAI,GAAGiB,WAAW,GACrB,IAAIG,IAAI,CAAC,CAACH,WAAW,CAACI,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAACC,WAAW,CAAC,CAAC,GACjD,IAAIF,IAAI,CAAC,CAAC,CAACE,WAAW,CAAC,CAAC;EAC9B;EACA,IAAI,CAACP,MAAM,CAACjB,EAAE,EAAE;IACdiB,MAAM,CAACjB,EAAE,GAAGqB,MAAM,CAACC,IAAI,CAACG,GAAG,CAAC,CAAC,CAAC;EAChC;;EAEA;EACA;EACA;EACA,MAAMC,SAAS,GAAG,CAACT,MAAM,CAACU,eAAe,IAAIV,MAAM,CAACS,SAAS,IAAI,EAAE,EAChEE,QAAQ,CAAC,CAAC,CACVC,IAAI,CAAC,CAAC;EACT,MAAMC,QAAQ,GAAG,CAACb,MAAM,CAACc,cAAc,IAAId,MAAM,CAACa,QAAQ,IAAI,EAAE,EAC7DF,QAAQ,CAAC,CAAC,CACVC,IAAI,CAAC,CAAC;EACT,MAAMG,QAAQ,GAAG,CAACf,MAAM,CAACe,QAAQ,IAAI,EAAE,EAAEJ,QAAQ,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC;EAC1D,MAAMI,SAAS,GAAG,CAAChB,MAAM,CAACgB,SAAS,IAAI,EAAE,EAAEL,QAAQ,CAAC,CAAC;EACrD,MAAMM,UAAU,GAAGD,SAAS,CAACpB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;EAChD,MAAMsB,cAAc,GAAGF,SAAS,CAACG,QAAQ,CAAC,GAAG,CAAC,GAAGH,SAAS,CAACpB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE;EACnF,MAAMwB,gBAAgB,GACpB,CAAC,CAACF,cAAc,KACfD,UAAU,KAAKb,MAAM,CAACJ,MAAM,CAACZ,OAAO,IAAI,EAAE,CAAC,IAC1C,gBAAgB,CAACiC,IAAI,CAACJ,UAAU,CAAC,CAAC;EACtC,MAAMK,WAAW,GAAGF,gBAAgB,GAChCF,cAAc,GACdD,UAAU,CAACE,QAAQ,CAAC,GAAG,CAAC,GACtBF,UAAU,CAACrB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GACxBqB,UAAU;;EAEhB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMpB,QAAQ,GAAG,CAACG,MAAM,CAACH,QAAQ,IAAI,EAAE,EAAEc,QAAQ,CAAC,CAAC;EACnD,MAAMY,YAAY,GAAG1B,QAAQ,CAACsB,QAAQ,CAAC,GAAG,CAAC,GAAGtB,QAAQ,CAACD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;EAEzE,MAAM4B,QAAQ,GAAGnD,WAAW,CAACoC,SAAS,EAAEI,QAAQ,CAAC;EACjD,MAAMY,YAAY,GAAGrB,MAAM,CAACJ,MAAM,EAAEd,IAAI,EAAEC,IAAI,IAAI,EAAE,CAAC,CAACyB,IAAI,CAAC,CAAC;EAC5D,MAAMc,YAAY,GAChBD,YAAY,IACZD,QAAQ,IACRT,QAAQ,IACRO,WAAW,IACXtB,MAAM,EAAEd,IAAI,EAAEH,EAAE,IAChB,EAAE;EAEJ,MAAM4C,WAAW,GACf3B,MAAM,CAAC4B,cAAc,KAAK,MAAM,IAAIxD,UAAU,CAACgC,MAAM,CAACJ,MAAM,CAACZ,OAAO,IAAI,EAAE,CAAC,CAAC;EAE9E,MAAMyC,UAAU,GACd7B,MAAM,CAAC8B,eAAe,KAAK,MAAM,GAC7BxD,oBAAoB,CAAC0B,MAAM,CAAChB,IAAI,CAAC,GACjCM,SAAS;EAEf,MAAMyC,OAAiB,GAAG;IACxB,GAAG/B,MAAM;IACT,IAAI2B,WAAW,GAAG;MAAEA,WAAW,EAAE;IAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,IAAIE,UAAU,GAAG;MAAEG,QAAQ,EAAEH,UAAU;MAAE7C,IAAI,EAAE;IAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9DE,IAAI,EAAE;MACJ,IAAIc,MAAM,CAACd,IAAI,IAAI,CAAC,CAAC,CAAC;MACtBH,EAAE,EAAEiB,MAAM,EAAEd,IAAI,EAAEH,EAAE,IAAIwC,YAAY,IAAID,WAAW;MACnDnC,IAAI,EAAEuC,YAAY;MAClBjB,SAAS,EAAEA,SAAS,IAAIT,MAAM,EAAEd,IAAI,EAAEuB,SAAS;MAC/CI,QAAQ,EAAEA,QAAQ,IAAIb,MAAM,EAAEd,IAAI,EAAE2B;IACtC;EACF,CAAC;EAED,OAAOkB,OAAO;AAChB,CAAC","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":[]}