@ethora/chat-component-rn 26.10.8 → 26.10.9

package/plugins/withNotificationServiceExtension.js

@@ -5,7 +5,15 @@
  *    the keychain and shows the real title and text in place of the
  *    "New message" placeholder;
  *  - shows the attachment thumbnail (photo / video preview) the push service
- *    sends as `previewUrl`.
+ *    sends as `previewUrl`;
+ *  - shows the sender's avatar (`image`, unless the app switched it off on
+ *    the push service) next to the text with the app icon as the small
+ *    badge: a communication notification. For that the app gets the
+ *    Communication Notifications capability
+ *    (com.apple.developer.usernotifications.communication) and
+ *    INSendMessageIntent in NSUserActivityTypes. With manual signing the
+ *    App ID needs the capability switched on in the developer portal; EAS
+ *    and Xcode's automatic signing do that themselves.
  *
  * An extension is a separate target signed with the app, so it cannot ship
  * inside the npm package as code: this plugin writes it into ios/ on every
@@ -25,11 +33,19 @@
  * Options:
  *   appleTeamId  signing team of the extension; default: ios.appleTeamId,
  *                else the team already set on the app target in Xcode.
+ *   communicationNotifications
+ *                false leaves the capability out (the avatar is then never
+ *                shown, pushes look as before); default true.
  */
 
 const fs = require('fs');
 const path = require('path');
-const { withDangerousMod, withEntitlementsPlist, withXcodeProject } = require('expo/config-plugins');
+const {
+  withDangerousMod,
+  withEntitlementsPlist,
+  withInfoPlist,
+  withXcodeProject,
+} = require('expo/config-plugins');
 
 const TARGET_NAME = 'EthoraNotificationService';
 const SOURCE_DIR = path.join(__dirname, 'notification-service');
@@ -37,6 +53,8 @@ const SOURCES = ['NotificationService.swift', 'SealedBox.swift'];
 const FILES = [...SOURCES, 'Info.plist'];
 const ENTITLEMENTS_FILE = `${TARGET_NAME}.entitlements`;
 const KEYCHAIN_GROUPS_KEY = 'keychain-access-groups';
+const COMMUNICATION_KEY = 'com.apple.developer.usernotifications.communication';
+const SEND_MESSAGE_INTENT = 'INSendMessageIntent';
 
 const appBundleId = (config) => {
   const bundleId = config.ios && config.ios.bundleIdentifier;
@@ -93,6 +111,25 @@ const withAppKeychainGroup = (config) =>
     return cfg;
   });
 
+// The sender's avatar: iOS shows a notification as a message from a person
+// only for an app with this capability that declares the intent.
+const withCommunicationNotifications = (config) =>
+  withInfoPlist(
+    withEntitlementsPlist(config, (cfg) => {
+      cfg.modResults[COMMUNICATION_KEY] = true;
+      return cfg;
+    }),
+    (cfg) => {
+      const types = Array.isArray(cfg.modResults.NSUserActivityTypes)
+        ? cfg.modResults.NSUserActivityTypes
+        : [];
+      if (!types.includes(SEND_MESSAGE_INTENT)) {
+        cfg.modResults.NSUserActivityTypes = [...types, SEND_MESSAGE_INTENT];
+      }
+      return cfg;
+    }
+  );
+
 const entitlementsPlist = (group) => `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -183,7 +220,10 @@ const withExtensionTarget = (config, { appleTeamId } = {}) =>
     return cfg;
   });
 
-const withNotificationServiceExtension = (config, props = {}) =>
-  withExtensionTarget(withExtensionFiles(withAppKeychainGroup(withEasAppExtension(config))), props);
+const withNotificationServiceExtension = (config, props = {}) => {
+  let next = withAppKeychainGroup(withEasAppExtension(config));
+  if (props.communicationNotifications !== false) next = withCommunicationNotifications(next);
+  return withExtensionTarget(withExtensionFiles(next), props);
+};
 
 module.exports = withNotificationServiceExtension;

package/src/components/Menu/HeaderRoomListMenu.tsx

@@ -273,14 +273,18 @@ export const HeaderRoomListMenu: FC<HeaderRoomListMenuProps> = ({
       onClick: () => void;
       styles?: { color: string };
     }[] = [
-      {
-        label: t('menu.newChat'),
-        icon: <AddNewIcon color={iconColor} />,
-        onClick: () => {
-          dispatch(setActiveModal(MODAL_TYPES.NEW_CHAT));
-        },
-        styles: { color: labelColor },
-      },
+      ...(!config?.chatHeaderSettings?.disableCreate
+        ? [
+            {
+              label: t('menu.newChat'),
+              icon: <AddNewIcon color={iconColor} />,
+              onClick: () => {
+                dispatch(setActiveModal(MODAL_TYPES.NEW_CHAT));
+              },
+              styles: { color: labelColor },
+            },
+          ]
+        : []),
       {
         label: t('menu.profile'),
         icon: <ProfileIcon color={iconColor} />,
@@ -329,6 +333,7 @@ export const HeaderRoomListMenu: FC<HeaderRoomListMenuProps> = ({
     iconColor,
     labelColor,
     config?.disablePublicChatsDirectory,
+    config?.chatHeaderSettings?.disableCreate,
     t,
   ]);
 

package/src/components/VideoCalls/useCallKeep.ts

@@ -2,8 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { Platform } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState, store } from '../../roomStore';
-import { acceptIncomingCall, declineIncomingCall } from '../../roomStore/callSlice';
-import { sendCallStateSignal } from '../../networking/callTokenStanza';
+import { acceptIncomingCall } from '../../roomStore/callSlice';
 import { declineActiveCallWhenOnline, terminateActiveCall } from './callActions';
 import { setCallMicEnabled, useCallSession } from './callSessionController';
 import { loadLiveKit } from './livekitRuntime';
@@ -162,8 +161,7 @@ export const useCallKeep = (): void => {
         snapshot.direction === 'incoming' &&
         snapshot.phase === 'ringing-incoming'
       ) {
-        sendCallStateSignal('declined');
-        dispatch(declineIncomingCall());
+        declineActiveCallWhenOnline();
         return;
       }
       // Ended from the Dynamic Island, the lock screen or a headset.

package/src/main.ts

@@ -81,7 +81,7 @@ export {
   presentSealedPush,
   SEALED_PUSH_TASK,
 } from './push/sealedPushTask';
-export type { SealedPushTaskOptions } from './push/sealedPushTask';
+export type { SealedPushTaskOptions, ShownMessagePush } from './push/sealedPushTask';
 export {
   openSealedPush,
   isSealedPush,

package/src/networking/callTokenStanza.ts

@@ -310,6 +310,8 @@ const handleCallStateData = (
     !!currentCall.callId &&
     currentCall.callId === stanzaCallId;
 
+  if (stanzaCallId && currentCall.callId && !callIdMatches) {return;}
+
   const isTerminalState =
     state === 'ended' ||
     state === 'declined' ||
@@ -381,7 +383,7 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
         .split('/')[0]
         .split('@')[0]
         .trim();
-      handleCallStateData(inner, fromRoom);
+      handleCallStateData(data, fromRoom);
 
       // Server call-logs (carry callerXmppUsername / durationMs) should
       // flow on to onRealtimeMessage / onMessageHistory where they become
@@ -394,6 +396,13 @@ export const onCallTokenMessage = (stanza: Element): boolean => {
       return true;
     }
 
+    if (dataType === 'call-state-declined') {
+      handleCallStateData({
+        attrs: { ...data.attrs, state: 'declined' },
+      } as unknown as Element);
+      return true;
+    }
+
     if (dataType === 'call-invite') {
       const inviteKind = String(data.attrs?.kind || '').toLowerCase();
       const normalized: 'audio' | 'video' =

package/src/push/sealedPushTask.ts

@@ -40,6 +40,20 @@ export interface SealedPushTaskOptions {
    * where the XMPP invite rings the in-app call screen.
    */
   onCallPush?: (data: Record<string, unknown>) => void | Promise<void>;
+  onMessageShown?: (shown: ShownMessagePush) => void | Promise<void>;
+}
+
+export interface ShownMessagePush {
+  identifier: string;
+  channelId?: string;
+  title: string;
+  body: string;
+  sender: string;
+  senderJid: string;
+  chat: string;
+  chatJid: string;
+  image: string;
+  reaction: boolean;
 }
 
 const PLACEHOLDER_TITLE = 'New message';
@@ -157,11 +171,30 @@ export async function presentSealedPush(
   const base = envelope.jid || envelope.msgID || '';
   const identifier = base ? (reaction ? `${base}#reaction` : base) : undefined;
   const channelId = (reaction && options.reactionChannelId) || options.channelId;
+  const content = notificationContent(result, options);
   await notifications.scheduleNotificationAsync({
     identifier,
-    content: notificationContent(result, options),
+    content,
     trigger: channelId ? { channelId } : null,
   });
+  if (result.ok && result.content.image && identifier && options.onMessageShown) {
+    try {
+      await options.onMessageShown({
+        identifier,
+        channelId,
+        title: content.title,
+        body: content.body ?? '',
+        sender: result.content.sender,
+        senderJid: result.content.senderJid,
+        chat: result.content.chat,
+        chatJid: result.content.chatJid,
+        image: result.content.image,
+        reaction,
+      });
+    } catch (e) {
+      pushLog('warn', 'push: drawing the sender avatar failed', e);
+    }
+  }
   return result;
 }
 

package/src/version.ts

@@ -1,3 +1,3 @@
 // Generated by scripts/sync-version.mjs on `npm version`.
 // Edit package.json's version instead of this file.
-export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.8';
+export const ETHORA_CHAT_COMPONENT_VERSION = '26.10.9';