@ethora/chat-component-rn 26.10.9 → 26.10.11

package/lib/module/helpers/incomingCallFromPush.js

@@ -4,6 +4,10 @@ import { store } from '../roomStore';
 import { acceptIncomingCall, setIncomingCallToken } from '../roomStore/callSlice';
 import { endSystemIncomingCall } from '../components/VideoCalls/systemCall';
 import { declineActiveCallWhenOnline } from '../components/VideoCalls/callActions';
+import { reportCallDeclined, reportCallEnded } from '../networking/api-requests/callState.api';
+import { sendCallStateSignal } from '../networking/callTokenStanza';
+import { decideIncomingWhileBusy } from '../calls/callMode';
+import { busySnapshot } from '../calls/callBusy';
 import { isCallPush, parseCallPush } from './callPush';
 import { normalizeRoomJid } from './normalizeRoomJid';
 const PENDING_CALL_PUSH_TTL_MS = 60_000;
@@ -66,19 +70,61 @@ const ringFromPush = (data, intent) => {
     endSystemIncomingCall(parsed.callId);
     return false;
   }
+  const isP2P = parsed.mode === 'p2p';
+
+  // A peer to peer call is correlated by its callId alone (there is no room
+  // token), and one call at a time: decided the way the call-token stanza
+  // decides it. The caller is told when we cannot take it.
+  if (isP2P) {
+    if (!parsed.callId) {
+      trace('p2p call push without a callId, dropping');
+      endSystemIncomingCall(parsed.callId);
+      return false;
+    }
+    const decision = decideIncomingWhileBusy(busySnapshot(state.call), {
+      mode: 'p2p',
+      callId: parsed.callId,
+      roomBareName: parsed.roomBareName
+    });
+    if (decision === 'duplicate') {
+      applyIntent(intent);
+      return true;
+    }
+    if (decision === 'busy' || decision === 'replace') {
+      trace('busy, declining p2p call', parsed.callId);
+      reportCallDeclined(parsed.callId);
+      sendCallStateSignal('declined', {
+        peerXmppUsername: parsed.callerXmppUsername,
+        callId: parsed.callId,
+        roomBareName: parsed.roomBareName
+      });
+      endSystemIncomingCall(parsed.callId);
+      return false;
+    }
+    if (decision === 'glare-keep') {
+      endSystemIncomingCall(parsed.callId);
+      return false;
+    }
+    if (decision === 'glare-yield') {
+      // Both sides dialled at once and theirs has the smaller id: drop ours.
+      sendCallStateSignal('cancelled');
+      reportCallEnded(state.call.callId);
+    }
+  }
 
   // Already ringing or in this exact call (the push raced the stanza, or
   // two pushes arrived). Re-dispatching would reset startedAt and restart
   // the ring, so leave the existing call alone.
   const current = state.call;
-  if (current.phase !== 'idle') {
+  if (!isP2P && current.phase !== 'idle') {
     const sameCall = !!parsed.callId && parsed.callId === current.callId || !!parsed.roomBareName && parsed.roomBareName === current.roomBareName;
     if (sameCall) {
       applyIntent(intent);
       return true;
     }
-    if (current.phase === 'in-call') {
-      // Busy with another call: no second ring.
+    if (current.phase === 'in-call' || current.mode === 'p2p') {
+      // Busy with another call: no second ring. (A p2p call is never
+      // replaced by a LiveKit one, whatever phase it is in.)
       endSystemIncomingCall(parsed.callId);
       return false;
     }
@@ -88,7 +134,8 @@ const ringFromPush = (data, intent) => {
   // an alert. Ringing anyway would give the user an Accept button that
   // cannot work, so treat it as handled and let the stanza (once the
   // socket is back up) open the real ring screen.
-  if (!parsed.token) {
+  // A p2p call carries no token by design: it is answered over XMPP.
+  if (!parsed.token && !isP2P) {
     endSystemIncomingCall(parsed.callId);
     return false;
   }
@@ -105,14 +152,23 @@ const ringFromPush = (data, intent) => {
     endSystemIncomingCall(parsed.callId);
     return false;
   }
+
+  // In a group the call is the ROOM and the caller is a separate line; a
+  // 1:1 call is named after the caller.
+  const roomTitle = resolved?.title || resolved?.name || null;
   store.dispatch(setIncomingCallToken({
     roomJid,
-    roomName: parsed.callerName || resolved?.title || resolved?.name || null,
+    roomName: parsed.isGroup ? roomTitle : parsed.callerName || roomTitle,
     roomBareName: parsed.roomBareName,
-    token: parsed.token,
+    token: parsed.token || '',
     kind: parsed.kind,
     callId: parsed.callId,
-    peerXmppUsername: parsed.callerXmppUsername
+    // A group has no single peer to signal.
+    peerXmppUsername: parsed.isGroup ? null : parsed.callerXmppUsername,
+    mode: parsed.mode,
+    isGroup: parsed.isGroup,
+    callerName: parsed.callerName,
+    callerXmppUsername: parsed.callerXmppUsername
   }));
   trace('ringing', parsed.callId, intent);
   applyIntent(intent);

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

@@ -1 +1 @@
-{"version":3,"names":["store","acceptIncomingCall","setIncomingCallToken","endSystemIncomingCall","declineActiveCallWhenOnline","isCallPush","parseCallPush","normalizeRoomJid","PENDING_CALL_PUSH_TTL_MS","pendingPush","unwatch","trace","args","__DEV__","console","log","callsConfigured","getState","chatSettingStore","config","videoCalls","undefined","holdUntilConfigured","data","intent","at","Date","now","subscribe","held","callId","ringFromPush","applyIntent","call","direction","phase","dispatch","parsed","state","enabled","current","sameCall","roomBareName","token","rooms","resolved","Object","values","find","room","jid","split","roomRef","conference","xmppSettings","fromRef","roomJid","includes","roomName","callerName","title","name","kind","peerXmppUsername","callerXmppUsername","handleCallPush","answerCallFromPush","declineCallFromPush","__resetCallPushForTests"],"sourceRoot":"../../../src","sources":["helpers/incomingCallFromPush.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["store","acceptIncomingCall","setIncomingCallToken","endSystemIncomingCall","declineActiveCallWhenOnline","reportCallDeclined","reportCallEnded","sendCallStateSignal","decideIncomingWhileBusy","busySnapshot","isCallPush","parseCallPush","normalizeRoomJid","PENDING_CALL_PUSH_TTL_MS","pendingPush","unwatch","trace","args","__DEV__","console","log","callsConfigured","getState","chatSettingStore","config","videoCalls","undefined","holdUntilConfigured","data","intent","at","Date","now","subscribe","held","callId","ringFromPush","applyIntent","call","direction","phase","dispatch","parsed","state","enabled","isP2P","mode","decision","roomBareName","peerXmppUsername","callerXmppUsername","current","sameCall","token","rooms","resolved","Object","values","find","room","jid","split","roomRef","conference","xmppSettings","fromRef","roomJid","includes","roomTitle","title","name","roomName","isGroup","callerName","kind","handleCallPush","answerCallFromPush","declineCallFromPush","__resetCallPushForTests"],"sourceRoot":"../../../src","sources":["helpers/incomingCallFromPush.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/helpers/publicChatsEntry.js

@@ -2,11 +2,13 @@
 
 /**
  * "Discover chats" lives in the room list menu sheet. A host that takes the
- * burger over (`headerMenu` as a function) or hides the menu
- * (`chatHeaderSettings.disableMenu`) would otherwise have no obvious way to
- * reach the directory, so it also gets a button of its own in the room list
- * header. `disableRoomMenu` removes the menu entry point, and with it the
- * button; `disablePublicChatsDirectory` removes the feature altogether.
+ * burger over (`headerMenu` as a function) would otherwise have no obvious
+ * way to reach the directory, so it also gets a button of its own in the
+ * room list header. `chatHeaderSettings.disableMenu` does not count: the
+ * header avatar still opens the sheet, Discover included, and a second
+ * compass next to it was a duplicate. `disableRoomMenu` removes the menu
+ * entry point, and with it the button; `disablePublicChatsDirectory`
+ * removes the feature altogether.
  */
-export const showsStandaloneDiscoverButton = config => !config?.disablePublicChatsDirectory && !config?.disableRoomMenu && (Boolean(config?.chatHeaderSettings?.disableMenu) || typeof config?.headerMenu === 'function');
+export const showsStandaloneDiscoverButton = config => !config?.disablePublicChatsDirectory && !config?.disableRoomMenu && typeof config?.headerMenu === 'function';
 //# sourceMappingURL=publicChatsEntry.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["showsStandaloneDiscoverButton","config","disablePublicChatsDirectory","disableRoomMenu","Boolean","chatHeaderSettings","disableMenu","headerMenu"],"sourceRoot":"../../../src","sources":["helpers/publicChatsEntry.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,6BAA6B,GAAIC,MAAgB,IAC5D,CAACA,MAAM,EAAEC,2BAA2B,IACpC,CAACD,MAAM,EAAEE,eAAe,KACvBC,OAAO,CAACH,MAAM,EAAEI,kBAAkB,EAAEC,WAAW,CAAC,IAC/C,OAAOL,MAAM,EAAEM,UAAU,KAAK,UAAU,CAAC","ignoreList":[]}
+{"version":3,"names":["showsStandaloneDiscoverButton","config","disablePublicChatsDirectory","disableRoomMenu","headerMenu"],"sourceRoot":"../../../src","sources":["helpers/publicChatsEntry.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,6BAA6B,GAAIC,MAAgB,IAC5D,CAACA,MAAM,EAAEC,2BAA2B,IACpC,CAACD,MAAM,EAAEE,eAAe,IACxB,OAAOF,MAAM,EAAEG,UAAU,KAAK,UAAU","ignoreList":[]}

package/lib/module/helpers/pushPayload.js

@@ -5,6 +5,7 @@ import { store } from '../roomStore';
 import { clearPendingNotificationJid, setCurrentRoom, setPendingNotificationJid } from '../roomStore/roomsSlice';
 import { handleCallPush } from './incomingCallFromPush';
 import { normalizeRoomJid } from './normalizeRoomJid';
+import { handleScheduledCallPush } from '../booking/pendingScheduledCall';
 export const PENDING_NOTIFICATION_JID_KEY = 'ethora_pending_notification_jid';
 export const PENDING_NOTIFICATION_TTL_MS = 5 * 60 * 1000;
 export const readPendingJid = async () => {
@@ -54,6 +55,10 @@ export const handlePushPayload = data => {
   if (handleCallPush(data)) {
     return 'call';
   }
+  // The reminder before a scheduled call opens the same flow as its link.
+  if (handleScheduledCallPush(data)) {
+    return 'scheduledCall';
+  }
   const jid = data.jid ?? data.chatJid ?? data.roomJid ?? data.roomJID;
   if (typeof jid === 'string' && jid) {
     return openRoomFromPush(jid);

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

@@ -1 +1 @@
-{"version":3,"names":["AsyncStorage","store","clearPendingNotificationJid","setCurrentRoom","setPendingNotificationJid","handleCallPush","normalizeRoomJid","PENDING_NOTIFICATION_JID_KEY","PENDING_NOTIFICATION_TTL_MS","readPendingJid","raw","getItem","startsWith","jid","at","JSON","parse","Date","now","removeItem","openRoomFromPush","state","getState","conference","chatSettingStore","config","xmppSettings","full","setItem","stringify","catch","undefined","rooms","dispatch","roomJID","handlePushPayload","data","chatJid","roomJid"],"sourceRoot":"../../../src","sources":["helpers/pushPayload.ts"],"mappings":";;AAAA,OAAOA,YAAY,MAAM,2CAA2C;AACpE,SAASC,KAAK,QAAQ,cAAc;AACpC,SACEC,2BAA2B,EAC3BC,cAAc,EACdC,yBAAyB,QACpB,yBAAyB;AAChC,SAASC,cAAc,QAAQ,wBAAwB;AACvD,SAASC,gBAAgB,QAAQ,oBAAoB;AAIrD,OAAO,MAAMC,4BAA4B,GAAG,iCAAiC;AAC7E,OAAO,MAAMC,2BAA2B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;AAExD,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAAA,KAAoC;EAChE,IAAI;IACF,MAAMC,GAAG,GAAG,MAAMV,YAAY,CAACW,OAAO,CAACJ,4BAA4B,CAAC;IACpE,IAAI,CAACG,GAAG,EAAE;MAAC,OAAO,IAAI;IAAC;IACvB,IAAIA,GAAG,CAACE,UAAU,CAAC,GAAG,CAAC,EAAE;MACvB,MAAM;QAAEC,GAAG;QAAEC;MAAG,CAAC,GAAGC,IAAI,CAACC,KAAK,CAACN,GAAG,CAAkC;MACpE,IAAI,CAACG,GAAG,IAAI,CAACC,EAAE,IAAIG,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGJ,EAAE,GAAGN,2BAA2B,EAAE;QAChE,MAAMR,YAAY,CAACmB,UAAU,CAACZ,4BAA4B,CAAC;QAC3D,OAAO,IAAI;MACb;MACA,OAAOM,GAAG;IACZ;IACA,OAAOH,GAAG;EACZ,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF,CAAC;AAED,OAAO,MAAMU,gBAAgB,GAAIP,GAAW,IAAyB;EACnE,MAAMQ,KAAK,GAAGpB,KAAK,CAACqB,QAAQ,CAAC,CAAC;EAC9B,MAAMC,UAAU,GAAGF,KAAK,CAACG,gBAAgB,EAAEC,MAAM,EAAEC,YAAY,EAAEH,UAAU;EAC3E,MAAMI,IAAI,GAAGrB,gBAAgB,CAACO,GAAG,EAAEU,UAAU,CAAC;EAE9CvB,YAAY,CAAC4B,OAAO,CAClBrB,4BAA4B,EAC5BQ,IAAI,CAACc,SAAS,CAAC;IAAEhB,GAAG,EAAEc,IAAI;IAAEb,EAAE,EAAEG,IAAI,CAACC,GAAG,CAAC;EAAE,CAAC,CAC9C,CAAC,CAACY,KAAK,CAAC,MAAMC,SAAS,CAAC;EACxB,IAAIV,KAAK,CAACW,KAAK,EAAEA,KAAK,GAAGL,IAAI,CAAC,EAAE;IAC9B1B,KAAK,CAACgC,QAAQ,CAAC/B,2BAA2B,CAAC,CAAC,CAAC;IAC7CD,KAAK,CAACgC,QAAQ,CAAC9B,cAAc,CAAC;MAAE+B,OAAO,EAAEP;IAAK,CAAC,CAAC,CAAC;IACjD,OAAO,MAAM;EACf;EACA1B,KAAK,CAACgC,QAAQ,CAAC7B,yBAAyB,CAACuB,IAAI,CAAC,CAAC;EAC/C,OAAO,SAAS;AAClB,CAAC;AAED,OAAO,MAAMQ,iBAAiB,GAC5BC,IAAgD,IACzB;EACvB,IAAI,CAACA,IAAI,EAAE;IAAC,OAAO,SAAS;EAAC;EAC7B,IAAI/B,cAAc,CAAC+B,IAA2B,CAAC,EAAE;IAAC,OAAO,MAAM;EAAC;EAChE,MAAMvB,GAAG,GAAGuB,IAAI,CAACvB,GAAG,IAAIuB,IAAI,CAACC,OAAO,IAAID,IAAI,CAACE,OAAO,IAAIF,IAAI,CAACF,OAAO;EACpE,IAAI,OAAOrB,GAAG,KAAK,QAAQ,IAAIA,GAAG,EAAE;IAClC,OAAOO,gBAAgB,CAACP,GAAG,CAAC;EAC9B;EACA,OAAO,SAAS;AAClB,CAAC","ignoreList":[]}
+{"version":3,"names":["AsyncStorage","store","clearPendingNotificationJid","setCurrentRoom","setPendingNotificationJid","handleCallPush","normalizeRoomJid","handleScheduledCallPush","PENDING_NOTIFICATION_JID_KEY","PENDING_NOTIFICATION_TTL_MS","readPendingJid","raw","getItem","startsWith","jid","at","JSON","parse","Date","now","removeItem","openRoomFromPush","state","getState","conference","chatSettingStore","config","xmppSettings","full","setItem","stringify","catch","undefined","rooms","dispatch","roomJID","handlePushPayload","data","chatJid","roomJid"],"sourceRoot":"../../../src","sources":["helpers/pushPayload.ts"],"mappings":";;AAAA,OAAOA,YAAY,MAAM,2CAA2C;AACpE,SAASC,KAAK,QAAQ,cAAc;AACpC,SACEC,2BAA2B,EAC3BC,cAAc,EACdC,yBAAyB,QACpB,yBAAyB;AAChC,SAASC,cAAc,QAAQ,wBAAwB;AACvD,SAASC,gBAAgB,QAAQ,oBAAoB;AACrD,SAASC,uBAAuB,QAAQ,iCAAiC;AASzE,OAAO,MAAMC,4BAA4B,GAAG,iCAAiC;AAC7E,OAAO,MAAMC,2BAA2B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI;AAExD,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAAA,KAAoC;EAChE,IAAI;IACF,MAAMC,GAAG,GAAG,MAAMX,YAAY,CAACY,OAAO,CAACJ,4BAA4B,CAAC;IACpE,IAAI,CAACG,GAAG,EAAE;MAAC,OAAO,IAAI;IAAC;IACvB,IAAIA,GAAG,CAACE,UAAU,CAAC,GAAG,CAAC,EAAE;MACvB,MAAM;QAAEC,GAAG;QAAEC;MAAG,CAAC,GAAGC,IAAI,CAACC,KAAK,CAACN,GAAG,CAAkC;MACpE,IAAI,CAACG,GAAG,IAAI,CAACC,EAAE,IAAIG,IAAI,CAACC,GAAG,CAAC,CAAC,GAAGJ,EAAE,GAAGN,2BAA2B,EAAE;QAChE,MAAMT,YAAY,CAACoB,UAAU,CAACZ,4BAA4B,CAAC;QAC3D,OAAO,IAAI;MACb;MACA,OAAOM,GAAG;IACZ;IACA,OAAOH,GAAG;EACZ,CAAC,CAAC,MAAM;IACN,OAAO,IAAI;EACb;AACF,CAAC;AAED,OAAO,MAAMU,gBAAgB,GAAIP,GAAW,IAAyB;EACnE,MAAMQ,KAAK,GAAGrB,KAAK,CAACsB,QAAQ,CAAC,CAAC;EAC9B,MAAMC,UAAU,GAAGF,KAAK,CAACG,gBAAgB,EAAEC,MAAM,EAAEC,YAAY,EAAEH,UAAU;EAC3E,MAAMI,IAAI,GAAGtB,gBAAgB,CAACQ,GAAG,EAAEU,UAAU,CAAC;EAE9CxB,YAAY,CAAC6B,OAAO,CAClBrB,4BAA4B,EAC5BQ,IAAI,CAACc,SAAS,CAAC;IAAEhB,GAAG,EAAEc,IAAI;IAAEb,EAAE,EAAEG,IAAI,CAACC,GAAG,CAAC;EAAE,CAAC,CAC9C,CAAC,CAACY,KAAK,CAAC,MAAMC,SAAS,CAAC;EACxB,IAAIV,KAAK,CAACW,KAAK,EAAEA,KAAK,GAAGL,IAAI,CAAC,EAAE;IAC9B3B,KAAK,CAACiC,QAAQ,CAAChC,2BAA2B,CAAC,CAAC,CAAC;IAC7CD,KAAK,CAACiC,QAAQ,CAAC/B,cAAc,CAAC;MAAEgC,OAAO,EAAEP;IAAK,CAAC,CAAC,CAAC;IACjD,OAAO,MAAM;EACf;EACA3B,KAAK,CAACiC,QAAQ,CAAC9B,yBAAyB,CAACwB,IAAI,CAAC,CAAC;EAC/C,OAAO,SAAS;AAClB,CAAC;AAED,OAAO,MAAMQ,iBAAiB,GAC5BC,IAAgD,IACzB;EACvB,IAAI,CAACA,IAAI,EAAE;IAAC,OAAO,SAAS;EAAC;EAC7B,IAAIhC,cAAc,CAACgC,IAA2B,CAAC,EAAE;IAAC,OAAO,MAAM;EAAC;EAChE;EACA,IAAI9B,uBAAuB,CAAC8B,IAAI,CAAC,EAAE;IAAC,OAAO,eAAe;EAAC;EAC3D,MAAMvB,GAAG,GAAGuB,IAAI,CAACvB,GAAG,IAAIuB,IAAI,CAACC,OAAO,IAAID,IAAI,CAACE,OAAO,IAAIF,IAAI,CAACF,OAAO;EACpE,IAAI,OAAOrB,GAAG,KAAK,QAAQ,IAAIA,GAAG,EAAE;IAClC,OAAOO,gBAAgB,CAACP,GAAG,CAAC;EAC9B;EACA,OAAO,SAAS;AAClB,CAAC","ignoreList":[]}

package/lib/module/helpers/reportRoom.js

@@ -0,0 +1,70 @@
+"use strict";
+
+// Report categories as the reader sees them (`labelKey`) and as the backend
+// accepts them (`apiCategory`). POST /v1/chats/reports/:chatName validates
+// `category` against a fixed lowercase list ("spam", "violance" [sic, that is
+// the server's spelling], "pornography", "personal details", "illegal drugs",
+// "other") and requires a non-empty `text`, so the UI ids must never go on
+// the wire as they are. A category the server has no value for is sent as
+// "other" with its English name at the start of the text, so a moderator
+// reading the report e-mail still sees what was picked.
+
+export const REPORT_CATEGORIES = [{
+  id: 'spam',
+  labelKey: 'report.category.spam',
+  apiCategory: 'spam',
+  name: 'Spam'
+}, {
+  id: 'violence',
+  labelKey: 'report.category.violence',
+  apiCategory: 'violance',
+  name: 'Violence'
+}, {
+  id: 'childAbuse',
+  labelKey: 'report.category.childAbuse',
+  apiCategory: 'other',
+  name: 'Child Abuse'
+}, {
+  id: 'pornography',
+  labelKey: 'report.category.pornography',
+  apiCategory: 'pornography',
+  name: 'Pornography'
+}, {
+  id: 'personalDetails',
+  labelKey: 'report.category.personalDetails',
+  apiCategory: 'personal details',
+  name: 'Personal Details'
+}, {
+  id: 'illegalDrugs',
+  labelKey: 'report.category.illegalDrugs',
+  apiCategory: 'illegal drugs',
+  name: 'Illegal Drugs'
+}];
+export const OTHER_REPORT_CATEGORY = {
+  id: 'other',
+  labelKey: 'report.category.other',
+  apiCategory: 'other',
+  name: 'Other'
+};
+export const findReportCategory = id => [...REPORT_CATEGORIES, OTHER_REPORT_CATEGORY].find(c => c.id === id);
+
+/**
+ * The request body for a room report. `roomJid` may be the full room JID or
+ * the bare room name: the route takes the bare name (JID localpart), like
+ * every other /v1/chats/... route. Returns null for an unknown category or
+ * an empty room.
+ */
+export const buildReportRoomPayload = (roomJid, categoryId, details) => {
+  const chatName = String(roomJid || '').trim().split('@')[0];
+  const category = findReportCategory(categoryId);
+  if (!chatName || !category) return null;
+  const note = String(details || '').trim();
+  const prefix = category.apiCategory === 'other' && category !== OTHER_REPORT_CATEGORY ? category.name : '';
+  const text = [prefix, note].filter(Boolean).join(': ') || category.name;
+  return {
+    chatName,
+    category: category.apiCategory,
+    text
+  };
+};
+//# sourceMappingURL=reportRoom.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["REPORT_CATEGORIES","id","labelKey","apiCategory","name","OTHER_REPORT_CATEGORY","findReportCategory","find","c","buildReportRoomPayload","roomJid","categoryId","details","chatName","String","trim","split","category","note","prefix","text","filter","Boolean","join"],"sourceRoot":"../../../src","sources":["helpers/reportRoom.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA,OAAO,MAAMA,iBAAmC,GAAG,CACjD;EACEC,EAAE,EAAE,MAAM;EACVC,QAAQ,EAAE,sBAAsB;EAChCC,WAAW,EAAE,MAAM;EACnBC,IAAI,EAAE;AACR,CAAC,EACD;EACEH,EAAE,EAAE,UAAU;EACdC,QAAQ,EAAE,0BAA0B;EACpCC,WAAW,EAAE,UAAU;EACvBC,IAAI,EAAE;AACR,CAAC,EACD;EACEH,EAAE,EAAE,YAAY;EAChBC,QAAQ,EAAE,4BAA4B;EACtCC,WAAW,EAAE,OAAO;EACpBC,IAAI,EAAE;AACR,CAAC,EACD;EACEH,EAAE,EAAE,aAAa;EACjBC,QAAQ,EAAE,6BAA6B;EACvCC,WAAW,EAAE,aAAa;EAC1BC,IAAI,EAAE;AACR,CAAC,EACD;EACEH,EAAE,EAAE,iBAAiB;EACrBC,QAAQ,EAAE,iCAAiC;EAC3CC,WAAW,EAAE,kBAAkB;EAC/BC,IAAI,EAAE;AACR,CAAC,EACD;EACEH,EAAE,EAAE,cAAc;EAClBC,QAAQ,EAAE,8BAA8B;EACxCC,WAAW,EAAE,eAAe;EAC5BC,IAAI,EAAE;AACR,CAAC,CACF;AAED,OAAO,MAAMC,qBAAqC,GAAG;EACnDJ,EAAE,EAAE,OAAO;EACXC,QAAQ,EAAE,uBAAuB;EACjCC,WAAW,EAAE,OAAO;EACpBC,IAAI,EAAE;AACR,CAAC;AAED,OAAO,MAAME,kBAAkB,GAAIL,EAAU,IAC3C,CAAC,GAAGD,iBAAiB,EAAEK,qBAAqB,CAAC,CAACE,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACP,EAAE,KAAKA,EAAE,CAAC;;AAExE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMQ,sBAAsB,GAAGA,CACpCC,OAAe,EACfC,UAAkB,EAClBC,OAAgB,KACU;EAC1B,MAAMC,QAAQ,GAAGC,MAAM,CAACJ,OAAO,IAAI,EAAE,CAAC,CACnCK,IAAI,CAAC,CAAC,CACNC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAChB,MAAMC,QAAQ,GAAGX,kBAAkB,CAACK,UAAU,CAAC;EAC/C,IAAI,CAACE,QAAQ,IAAI,CAACI,QAAQ,EAAE,OAAO,IAAI;EAEvC,MAAMC,IAAI,GAAGJ,MAAM,CAACF,OAAO,IAAI,EAAE,CAAC,CAACG,IAAI,CAAC,CAAC;EACzC,MAAMI,MAAM,GACVF,QAAQ,CAACd,WAAW,KAAK,OAAO,IAAIc,QAAQ,KAAKZ,qBAAqB,GAClEY,QAAQ,CAACb,IAAI,GACb,EAAE;EACR,MAAMgB,IAAI,GAAG,CAACD,MAAM,EAAED,IAAI,CAAC,CAACG,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC,IAAIN,QAAQ,CAACb,IAAI;EAEvE,OAAO;IAAES,QAAQ;IAAEI,QAAQ,EAAEA,QAAQ,CAACd,WAAW;IAAEiB;EAAK,CAAC;AAC3D,CAAC","ignoreList":[]}

package/lib/module/helpers/roomMedia.js

@@ -0,0 +1,112 @@
+"use strict";
+
+import { getAttachmentName, getMessageAttachments } from './attachments';
+import { getFileKind } from './fileKind';
+import { appendFileToken } from './secureFileUrl';
+import { parseMessageReference } from './parseMessageReference';
+import { composeName } from './displayName';
+import { isOwnMessage } from './isOwnMessage';
+/**
+ * Every picture and video of the room's loaded history, newest first, each
+ * carrying the message it came from so the viewer's Reply and Delete act on
+ * the right one (same rules as a bubble: Delete on one's own, Reply where
+ * replies are on).
+ */
+export const collectRoomMedia = (messages, roomJid, {
+  me,
+  fileToken,
+  interactive,
+  repliesOn
+}) => {
+  const files = [];
+  for (let i = (messages?.length ?? 0) - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message.isMediafile !== 'true' || message.isDeleted || message.pending || message.clientEncrypted === 'true' || !message.id) {
+      continue;
+    }
+    const parent = parseMessageReference(message);
+    const sentAt = new Date(message.date).getTime();
+    const source = {
+      messageId: message.id,
+      roomJid: message.roomJid || roomJid,
+      own: interactive && isOwnMessage(message, me),
+      replyTo: interactive && repliesOn ? parent ? {
+        id: parent.id,
+        chatJID: parent.roomJid || message.roomJid || roomJid
+      } : {
+        id: message.id,
+        chatJID: message.roomJid || roomJid
+      } : undefined,
+      senderName: composeName(message.user?.firstName, message.user?.lastName) || message.user?.name || undefined,
+      timestamp: Number.isFinite(sentAt) ? sentAt : undefined
+    };
+    for (const attachment of getMessageAttachments(message)) {
+      if (!attachment.location) {
+        continue;
+      }
+      const kind = getFileKind({
+        mimetype: attachment.mimetype,
+        name: getAttachmentName(attachment),
+        url: attachment.location,
+        duration: attachment.duration
+      });
+      if (kind !== 'image' && kind !== 'video') {
+        continue;
+      }
+      files.push({
+        fileName: getAttachmentName(attachment),
+        originalName: attachment.originalName,
+        fileURL: appendFileToken(attachment.location, fileToken) || attachment.location,
+        mimetype: attachment.mimetype || (kind === 'image' ? 'image/jpeg' : 'video/mp4'),
+        duration: attachment.duration,
+        previewURL: appendFileToken(attachment.locationPreview, fileToken),
+        source
+      });
+    }
+  }
+  return files;
+};
+const sentAt = message => new Date(message.date).getTime() || 0;
+
+/** A thread-only reply: shown in its thread, not in the channel. */
+const threadParentOf = message => message.mainMessage && message.showInChannel !== 'true' ? parseMessageReference(message)?.id ?? null : null;
+
+/** The file's address without its access token, which may differ per copy. */
+const bareUrl = url => (url || '').split('?')[0];
+
+/**
+ * The media feed the viewer pages through when a picture or video is opened
+ * from a bubble: every picture and video of the list that bubble sits in (the
+ * channel, or the one thread for a thread-only reply), oldest first so a
+ * swipe to the left goes forward in time, the way the chat reads. The opened
+ * file comes back with that feed as its siblings; null when the file is not
+ * in the loaded history (the caller then keeps what it was opened with).
+ */
+export const withChatSiblings = (file, messages, options) => {
+  const source = file.source;
+  if (!source || !messages?.length) {
+    return null;
+  }
+  const opened = messages.find(m => String(m.id) === String(source.messageId));
+  if (!opened) {
+    return null;
+  }
+  const thread = threadParentOf(opened);
+  // collectRoomMedia walks from the end, so newest-first in gives oldest
+  // first out, with an album's files still in their own order.
+  const scoped = messages.filter(m => threadParentOf(m) === thread).sort((a, b) => sentAt(b) - sentAt(a));
+  const feed = collectRoomMedia(scoped, source.roomJid, options);
+  const url = bareUrl(file.fileURL);
+  const index = feed.findIndex(f => f.source?.messageId === source.messageId && bareUrl(f.fileURL) === url);
+  if (index < 0) {
+    return null;
+  }
+  // The bubble's own rules for Reply and Delete stay with the opened file.
+  return {
+    ...feed[index],
+    source,
+    siblings: feed,
+    index
+  };
+};
+//# sourceMappingURL=roomMedia.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["getAttachmentName","getMessageAttachments","getFileKind","appendFileToken","parseMessageReference","composeName","isOwnMessage","collectRoomMedia","messages","roomJid","me","fileToken","interactive","repliesOn","files","i","length","message","isMediafile","isDeleted","pending","clientEncrypted","id","parent","sentAt","Date","date","getTime","source","messageId","own","replyTo","chatJID","undefined","senderName","user","firstName","lastName","name","timestamp","Number","isFinite","attachment","location","kind","mimetype","url","duration","push","fileName","originalName","fileURL","previewURL","locationPreview","threadParentOf","mainMessage","showInChannel","bareUrl","split","withChatSiblings","file","options","opened","find","m","String","thread","scoped","filter","sort","a","b","feed","index","findIndex","f","siblings"],"sourceRoot":"../../../src","sources":["helpers/roomMedia.ts"],"mappings":"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","ignoreList":[]}