@droppii-org/chat-mobile 0.2.66 → 0.2.67

package/src/store/conversation.ts

@@ -1,5 +1,6 @@
 import { create } from 'zustand';
-import { sortConversation } from '../utils/conversation';
+import { SessionType } from '@droppii/openim-rn-client-sdk';
+import { getConversationID, sortConversation } from '../utils/conversation';
 import type { ConversationItem } from '@droppii/openim-rn-client-sdk';
 
 type ConversationID = string;
@@ -18,6 +19,13 @@ export interface ConversationStore {
   map: Record<ConversationID, ConversationItem>;
   /** Signal incremented when a truly new conversation arrives and a full refetch is needed. */
   newConversationSignal: number;
+  /**
+   * Group IDs the user just left/was removed from. Any late-arriving SDK
+   * event (OnConversationChanged, OnNewConversation, ...) that still carries
+   * this group must not resurrect it — without this guard those events race
+   * with removeGroupConversation and silently undo the removal.
+   */
+  removedGroupIds: Set<string>;
   updateConversation(id: ConversationID, data: Partial<ConversationItem>): void;
   updateConversations(conversations: ConversationItem[]): void;
   /**
@@ -25,6 +33,10 @@ export interface ConversationStore {
    * Returns true if any conversation was not found in the store (triggers refetch).
    */
   removeConversation(id: ConversationID): void;
+  /** Removes a group's conversation and guards it against being re-added. */
+  removeGroupConversation(groupID: string): void;
+  /** Lifts the removal guard once the user (re)joins the group. */
+  restoreGroupConversation(groupID: string): void;
   reset(): void;
 }
 
@@ -32,6 +44,7 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
   list: [],
   map: {},
   newConversationSignal: 0,
+  removedGroupIds: new Set(),
   setCurrentConversation(id, userId, groupId) {
     set({
       currentConversationId: id,
@@ -49,25 +62,38 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
     const existing = get().map[id];
     if (!existing) return;
 
-    set(
-      sortConversation({
-        ...get().map,
-        [id]: { ...existing, ...data },
-      })
-    );
+    const merged = { ...existing, ...data };
+    const nextMap = { ...get().map };
+    if (merged.isNotInGroup || get().removedGroupIds.has(merged.groupID)) {
+      delete nextMap[id];
+    } else {
+      nextMap[id] = merged;
+    }
+    set(sortConversation(nextMap));
   },
   updateConversations(conversations) {
-    set(
-      sortConversation(
-        conversations.reduce(
-          (pre, curr) => {
-            pre[curr.conversationID] = curr;
-            return pre;
-          },
-          { ...get().map }
-        )
-      )
+    const removedGroupIds = get().removedGroupIds;
+    const nextMap = conversations.reduce(
+      (pre, curr) => {
+        if (curr.isNotInGroup || removedGroupIds.has(curr.groupID)) {
+          // console.log(
+          //   '[Store] updateConversations: dropping guarded/left group',
+          //   {
+          //     conversationID: curr.conversationID,
+          //     groupID: curr.groupID,
+          //     isNotInGroup: curr.isNotInGroup,
+          //     guarded: removedGroupIds.has(curr.groupID),
+          //   }
+          // );
+          delete pre[curr.conversationID];
+        } else {
+          pre[curr.conversationID] = curr;
+        }
+        return pre;
+      },
+      { ...get().map }
     );
+    set(sortConversation(nextMap));
   },
   removeConversation(id) {
     const newMap = { ...get().map };
@@ -78,12 +104,31 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
       list: get().list.filter((item) => item !== id),
     });
   },
+  removeGroupConversation(groupID) {
+    const conversationID = getConversationID(SessionType.Group, groupID);
+
+    const newMap = { ...get().map };
+    delete newMap[conversationID];
+
+    set({
+      map: newMap,
+      list: get().list.filter((item) => item !== conversationID),
+      removedGroupIds: new Set(get().removedGroupIds).add(groupID),
+    });
+  },
+  restoreGroupConversation(groupID) {
+    // console.log('[Store] restoreGroupConversation', { groupID });
+    const nextRemovedGroupIds = new Set(get().removedGroupIds);
+    nextRemovedGroupIds.delete(groupID);
+    set({ removedGroupIds: nextRemovedGroupIds });
+  },
   reset() {
     set({
       currentConversationId: undefined,
       list: [],
       map: {},
       newConversationSignal: 0,
+      removedGroupIds: new Set(),
     });
   },
 }));

package/src/translation/resources/i18n.ts

@@ -71,6 +71,37 @@ const i18nKey: Record<string, string> = {
   'msg_type_link': '[Liên kết]',
   'msg_type_revoke': 'Đã thu hồi tin nhắn',
   'chat:revoked_by_sender': '{{sender}} đã thu hồi tin nhắn',
+  'msg_type_group_created': 'Đã tạo nhóm',
+  'chat:group_created_by': '{{sender}} đã tạo nhóm',
+  'msg_type_group_name_updated': 'Đã đổi tên nhóm',
+  'chat:group_name_updated_by': '{{sender}} đã đổi tên nhóm',
+  'msg_type_group_info_updated': 'Đã cập nhật thông tin nhóm',
+  'chat:group_info_updated_by': '{{sender}} đã cập nhật thông tin nhóm',
+  'msg_type_member_quit': 'Đã rời khỏi nhóm',
+  'chat:member_quit_by': '{{sender}} đã rời khỏi nhóm',
+  'msg_type_group_owner_transferred': 'Đã chuyển quyền trưởng nhóm',
+  'chat:group_owner_transferred_by': '{{sender}} đã chuyển quyền trưởng nhóm',
+  'msg_type_member_kicked': 'Đã xoá thành viên khỏi nhóm',
+  'chat:member_kicked_by': '{{sender}} đã xoá thành viên khỏi nhóm',
+  'msg_type_member_invited': 'Đã thêm thành viên vào nhóm',
+  'chat:member_invited_by': '{{sender}} đã thêm thành viên vào nhóm',
+  'msg_type_member_enter': 'Đã tham gia nhóm',
+  'chat:member_enter_by': '{{sender}} đã tham gia nhóm',
+  'msg_type_group_dismissed': 'Nhóm đã bị giải tán',
+  'chat:group_dismissed_by': '{{sender}} đã giải tán nhóm',
+  'msg_type_group_member_muted': 'Đã tắt tiếng thành viên',
+  'chat:group_member_muted_by': '{{sender}} đã tắt tiếng thành viên',
+  'msg_type_group_member_cancel_muted': 'Đã bật tiếng thành viên',
+  'chat:group_member_cancel_muted_by': '{{sender}} đã bật tiếng thành viên',
+  'msg_type_group_muted': 'Đã tắt tiếng cả nhóm',
+  'chat:group_muted_by': '{{sender}} đã tắt tiếng cả nhóm',
+  'msg_type_group_cancel_muted': 'Đã bật tiếng cả nhóm',
+  'chat:group_cancel_muted_by': '{{sender}} đã bật tiếng cả nhóm',
+  'msg_type_group_announcement_updated': 'Đã cập nhật thông báo nhóm',
+  'chat:group_announcement_updated_by': '{{sender}} đã cập nhật thông báo nhóm',
+  'msg_type_friend_added': 'Đã trở thành bạn bè',
+  'msg_type_oa_notification': 'Thông báo mới',
+  'msg_type_burn_message_change': 'Đã thay đổi cài đặt tin nhắn tự huỷ',
   'chat:mute_action': 'Tắt thông báo',
   'chat:unmute_action': 'Bật thông báo',
   'chat:mute_confirm_title': 'Tắt thông báo',

package/src/types/events.ts

@@ -5,6 +5,7 @@ export enum ChatEvent {
   ScrollToBottom = 'chat:scroll_to_bottom',
   MessageRevoked = 'chat:message_revoked',
   GroupPermissionUpdated = 'chat:group_permission_updated',
+  GroupRemoved = 'chat:group_removed',
 }
 
 export interface ScrollToMessagePayload {
@@ -18,3 +19,8 @@ export interface MessageRevokedPayload {
 export interface GroupPermissionUpdatedPayload {
   permissions: GroupPermission[];
 }
+
+export interface GroupRemovedPayload {
+  groupID: string;
+  reason: 'left' | 'dismissed' | 'kicked';
+}

package/src/utils/messageUtils.ts

@@ -17,6 +17,70 @@ import type { TextProps } from 'react-native';
 export const isMessageRevoked = (message: MessageItem): boolean =>
   message.contentType === MessageType.RevokeMessage;
 
+// Group system-notification content types (1501-1520 block): each renders as
+// a neutral preview on its own, and as "{{sender}} <action>" once the
+// operator's name is known (see getSenderName/getNotificationOpUserNickname).
+export const GROUP_NOTIFICATION_TEXT: Partial<
+  Record<MessageType, { previewKey: string; bySenderKey: string }>
+> = {
+  [MessageType.GroupCreated]: {
+    previewKey: 'msg_type_group_created',
+    bySenderKey: 'chat:group_created_by',
+  },
+  [MessageType.GroupInfoUpdated]: {
+    previewKey: 'msg_type_group_info_updated',
+    bySenderKey: 'chat:group_info_updated_by',
+  },
+  [MessageType.MemberQuit]: {
+    previewKey: 'msg_type_member_quit',
+    bySenderKey: 'chat:member_quit_by',
+  },
+  [MessageType.GroupOwnerTransferred]: {
+    previewKey: 'msg_type_group_owner_transferred',
+    bySenderKey: 'chat:group_owner_transferred_by',
+  },
+  [MessageType.MemberKicked]: {
+    previewKey: 'msg_type_member_kicked',
+    bySenderKey: 'chat:member_kicked_by',
+  },
+  [MessageType.MemberInvited]: {
+    previewKey: 'msg_type_member_invited',
+    bySenderKey: 'chat:member_invited_by',
+  },
+  [MessageType.MemberEnter]: {
+    previewKey: 'msg_type_member_enter',
+    bySenderKey: 'chat:member_enter_by',
+  },
+  [MessageType.GroupDismissed]: {
+    previewKey: 'msg_type_group_dismissed',
+    bySenderKey: 'chat:group_dismissed_by',
+  },
+  [MessageType.GroupMemberMuted]: {
+    previewKey: 'msg_type_group_member_muted',
+    bySenderKey: 'chat:group_member_muted_by',
+  },
+  [MessageType.GroupMemberCancelMuted]: {
+    previewKey: 'msg_type_group_member_cancel_muted',
+    bySenderKey: 'chat:group_member_cancel_muted_by',
+  },
+  [MessageType.GroupMuted]: {
+    previewKey: 'msg_type_group_muted',
+    bySenderKey: 'chat:group_muted_by',
+  },
+  [MessageType.GroupCancelMuted]: {
+    previewKey: 'msg_type_group_cancel_muted',
+    bySenderKey: 'chat:group_cancel_muted_by',
+  },
+  [MessageType.GroupAnnouncementUpdated]: {
+    previewKey: 'msg_type_group_announcement_updated',
+    bySenderKey: 'chat:group_announcement_updated_by',
+  },
+  [MessageType.GroupNameUpdated]: {
+    previewKey: 'msg_type_group_name_updated',
+    bySenderKey: 'chat:group_name_updated_by',
+  },
+};
+
 export const extractTextContent = (message: MessageItem): string => {
   if (message.textElem?.content) return message.textElem.content;
   try {
@@ -102,8 +166,23 @@ export const getMessagePreview = (message?: MessageItem): string => {
 
     case MessageType.StickerMessage:
       return '[Sticker]';
-    default:
+
+    case MessageType.FriendAdded:
+      return trans('msg_type_friend_added');
+
+    case MessageType.OANotification:
+      return trans('msg_type_oa_notification');
+
+    case MessageType.BurnMessageChange:
+      return trans('msg_type_burn_message_change');
+
+    default: {
+      const groupNotification = GROUP_NOTIFICATION_TEXT[message.contentType];
+      if (groupNotification) {
+        return trans(groupNotification.previewKey);
+      }
       return '[Tin nhắn không được hỗ trợ]';
+    }
   }
 };
 
@@ -216,6 +295,23 @@ export const getPinnedMessagePreview = (
   }
 };
 
+// Group notification messages (renamed/created/etc.) don't always carry
+// `senderNickname` at the top level — the operator's nickname only lives
+// inside the JSON-encoded `notificationElem.detail.opUser`.
+export const getNotificationOpUserNickname = (
+  message: MessageItem
+): string | undefined => {
+  if (!message.notificationElem?.detail) return undefined;
+  try {
+    const parsed = JSON.parse(message.notificationElem.detail) as {
+      opUser?: { nickname?: string };
+    };
+    return parsed?.opUser?.nickname;
+  } catch {
+    return undefined;
+  }
+};
+
 export const getSenderName = (
   message: MessageItem,
   currentUserId?: string,
@@ -225,6 +321,7 @@ export const getSenderName = (
     currentUserId && message.sendID === currentUserId
       ? 'Bạn'
       : message?.senderNickname ||
+        getNotificationOpUserNickname(message) ||
         (conversation?.peerType === PeerType.Bot
           ? conversation?.showName || ''
           : undefined);
@@ -256,6 +353,11 @@ 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 hideSenderPrefix =
     hideSenderPrefixForDirectChat && conversation?.peerType === PeerType.User;