@droppii-org/chat-mobile 0.2.77 → 0.2.78

package/src/utils/messageUtils.ts

@@ -79,6 +79,120 @@ export const GROUP_NOTIFICATION_TEXT: Partial<
     previewKey: 'msg_type_group_name_updated',
     bySenderKey: 'chat:group_name_updated_by',
   },
+  [MessageType.GroupMemberSetToAdmin]: {
+    previewKey: 'msg_type_group_member_set_admin',
+    bySenderKey: 'chat:group_member_set_admin_by_generic',
+  },
+  // One content type, two texts (pinned vs unpinned) — the base entry here is
+  // just the "unpinned" fallback; resolveNotificationText() below overrides
+  // it to the "pinned" keys when notificationElem.detail.isPinned is true.
+  [MessageType.PinMsg]: {
+    previewKey: 'msg_type_message_unpinned',
+    bySenderKey: 'chat:group_message_unpinned_by',
+  },
+};
+
+const parseNotificationDetail = (message: MessageItem): any => {
+  if (!message.notificationElem?.detail) return undefined;
+  try {
+    return JSON.parse(message.notificationElem.detail);
+  } catch {
+    return undefined;
+  }
+};
+
+// PM-approved rule for "N members added/removed at once": 1-2 names are
+// listed in full, 3+ collapse to the first two names plus a trailing count.
+// Renders identically to the spec either way — e.g. 4 invites become
+// "B, C và 2 người khác".
+const formatMemberNames = (
+  members: Array<{ nickname?: string }> | undefined
+): string | undefined => {
+  const names = (members ?? [])
+    .map((member) => member?.nickname)
+    .filter((nickname): nickname is string => !!nickname);
+
+  if (names.length === 0) return undefined;
+  if (names.length <= 2) return names.join(', ');
+  return `${names[0]}, ${names[1]} và ${names.length - 2} người khác`;
+};
+
+export interface ResolvedNotificationText {
+  previewKey: string;
+  bySenderKey: string;
+  params: Record<string, string>;
+}
+
+// GROUP_NOTIFICATION_TEXT above only covers the static "no extra data needed"
+// shape. This resolver layers in the per-event params (affected member name,
+// new group name, pinned/unpinned) confirmed against real captured payloads —
+// upgrading to a `_named`/`_by` key when the data is present, and silently
+// falling back to the generic base key when it's missing or malformed so the
+// UI never shows a raw `{{placeholder}}` or throws on a bad payload.
+export const resolveNotificationText = (
+  message: MessageItem
+): ResolvedNotificationText | undefined => {
+  const base = GROUP_NOTIFICATION_TEXT[message.contentType];
+  if (!base) return undefined;
+
+  let previewKey = base.previewKey;
+  let bySenderKey = base.bySenderKey;
+  const params: Record<string, string> = {};
+  const detail = parseNotificationDetail(message);
+
+  switch (message.contentType) {
+    case MessageType.GroupNameUpdated: {
+      const newGroupName = detail?.group?.groupName;
+      if (newGroupName) {
+        params.newGroupName = newGroupName;
+        bySenderKey = 'chat:group_name_updated_by_named';
+      }
+      break;
+    }
+    case MessageType.MemberInvited: {
+      const names = formatMemberNames(detail?.invitedUserList);
+      if (names) {
+        params.names = names;
+        bySenderKey = 'chat:member_invited_by_named';
+      }
+      break;
+    }
+    case MessageType.MemberKicked: {
+      const names = formatMemberNames(detail?.kickedUserList);
+      if (names) {
+        params.names = names;
+        bySenderKey = 'chat:member_kicked_by_named';
+      }
+      break;
+    }
+    case MessageType.GroupOwnerTransferred: {
+      const memberName = detail?.newGroupOwner?.nickname;
+      if (memberName) {
+        params.memberName = memberName;
+        bySenderKey = 'chat:group_owner_transferred_by_named';
+      }
+      break;
+    }
+    case MessageType.GroupMemberSetToAdmin: {
+      const memberName = detail?.changedUser?.nickname;
+      if (memberName) {
+        params.memberName = memberName;
+        bySenderKey = 'chat:group_member_set_admin_by';
+      }
+      break;
+    }
+    case MessageType.PinMsg: {
+      if (detail?.isPinned === true) {
+        previewKey = 'msg_type_message_pinned';
+        bySenderKey = 'chat:group_message_pinned_by';
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return { previewKey, bySenderKey, params };
 };
 
 export const extractTextContent = (message: MessageItem): string => {
@@ -177,9 +291,9 @@ export const getMessagePreview = (message?: MessageItem): string => {
       return trans('msg_type_burn_message_change');
 
     default: {
-      const groupNotification = GROUP_NOTIFICATION_TEXT[message.contentType];
-      if (groupNotification) {
-        return trans(groupNotification.previewKey);
+      const resolved = resolveNotificationText(message);
+      if (resolved) {
+        return trans(resolved.previewKey, resolved.params);
       }
       return '[Tin nhắn không được hỗ trợ]';
     }
@@ -305,8 +419,11 @@ export const getNotificationOpUserNickname = (
   try {
     const parsed = JSON.parse(message.notificationElem.detail) as {
       opUser?: { nickname?: string };
+      quitUser?: { nickname?: string };
     };
-    return parsed?.opUser?.nickname;
+    // MemberQuit puts the leaver in `quitUser`, not `opUser` — every other
+    // group-notification content type uses `opUser` for the actor.
+    return parsed?.opUser?.nickname ?? parsed?.quitUser?.nickname;
   } catch {
     return undefined;
   }
@@ -353,9 +470,12 @@ export const getLastMessageText = ({
     return trans('chat:revoked_by_sender', { sender });
   }
 
-  const groupNotification = GROUP_NOTIFICATION_TEXT[message.contentType];
-  if (groupNotification) {
-    return trans(groupNotification.bySenderKey, { sender });
+  const resolvedNotification = resolveNotificationText(message);
+  if (resolvedNotification) {
+    return trans(resolvedNotification.bySenderKey, {
+      sender,
+      ...resolvedNotification.params,
+    });
   }
 
   const hideSenderPrefix =

package/src/utils/toastFlashMessage.ts

@@ -1,4 +1,4 @@
-import Toast from 'react-native-toast-message';
+import Toast, { type BaseToastProps } from 'react-native-toast-message';
 
 interface ShowFlashMessageParams {
   key: string;
@@ -16,6 +16,12 @@ const VISIBILITY_TIME_MS = 2000;
 
 const displayToast = (params: ShowFlashMessageParams) => {
   currentKey = params.key;
+  // `text2Props` isn't part of react-native-toast-message's own
+  // `ToastShowParams` type, but the `info` renderer registered in
+  // toastFlashMessageConfig.tsx spreads these show() params straight onto
+  // `<BaseToast>`, which does declare `text2Props` — so it works at runtime,
+  // it's just missing from the upstream type. Widen the type locally instead
+  // of casting the whole call to `any`.
   Toast.show({
     type: 'info',
     text1: params.title,
@@ -32,7 +38,7 @@ const displayToast = (params: ShowFlashMessageParams) => {
       avatarUrl: params?.avatarUrl,
       fullName: params.title,
     },
-  });
+  } as Parameters<typeof Toast.show>[0] & Pick<BaseToastProps, 'text2Props'>);
 };
 
 function advanceQueue() {