@droppii-org/chat-mobile 0.2.6 → 0.2.7

package/src/store/conversation.ts

@@ -48,7 +48,7 @@ export const useConversationStore = create<ConversationStore>()((set, get) => ({
       sortConversation(
         conversations.reduce(
           (pre, curr) => {
-            pre[curr.conversationId] = curr;
+            pre[curr.conversationID] = curr;
             return pre;
           },
           { ...get().map }

package/src/store/message.ts

@@ -0,0 +1,44 @@
+import { create } from 'zustand';
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
+import type { DMessageItem, MessageStore } from '../types/chat';
+import { mergeMessages } from '../utils/message';
+
+export const useMessageStore = create<MessageStore>()((set, get) => ({
+  messages: [],
+  hasMoreEarlier: false,
+  hasMoreNewer: false,
+
+  setMessages: (messages, hasMore) => {
+    set({ messages, hasMoreEarlier: hasMore });
+  },
+
+  pushNewMessage: (message: MessageItem) => {
+    set((state) => ({
+      messages: mergeMessages(state.messages, [message as DMessageItem]),
+    }));
+  },
+
+  updateOneMessage: (message: MessageItem) => {
+    const tmpList = [...get().messages];
+    const idx = tmpList.findIndex(
+      (msg) => msg.clientMsgID === message.clientMsgID
+    );
+    if (idx < 0) return;
+    tmpList[idx] = { ...tmpList[idx]!, ...message } as DMessageItem;
+    set({ messages: tmpList });
+  },
+
+  deleteOneMessage: (clientMsgID: string) => {
+    set((state) => ({
+      messages: state.messages.filter((msg) => msg.clientMsgID !== clientMsgID),
+    }));
+  },
+
+  reset: () => {
+    set({
+      messages: [],
+      hasMoreEarlier: false,
+      hasMoreNewer: false,
+    });
+  },
+}));

package/src/translation/resources/i18n.ts

@@ -1,6 +1,12 @@
 const i18nKey: Record<string, string> = {
   thread_card_bot_crm_name: 'Droppii Hỗ Trợ',
   thread_card_fallback_name: 'Người dùng',
+  msg_type_image: '[Hình ảnh]',
+  msg_type_voice: '[Tin nhắn thoại]',
+  msg_type_video: '[Video]',
+  msg_type_file: '[File đính kèm]',
+  msg_type_link: '[Liên kết]',
+  msg_type_revoke: 'Đã thu hồi tin nhắn',
 };
 
 export default {

package/src/types/chat.ts

@@ -1,10 +1,10 @@
 import {
   type MessageItem,
-  type SessionType,
-  type MessageReceiveOptType,
-  type GroupAtType,
+  type ConversationItem,
+  PeerType,
 } from '@droppii/openim-rn-client-sdk';
 import type { PropsWithChildren } from 'react';
+import type { IUrlMetadata } from './common';
 
 export const EventProvider = {
   ga: 'ga',
@@ -20,16 +20,17 @@ type LogGA = (
 
 export interface ChatContextType {
   logGA?: LogGA;
+  applicationType: DChatApplicationType;
 }
 
 export type ChatProviderProps = PropsWithChildren<{
-  enabled?: boolean;
   logGA?: LogGA;
+  applicationType: DChatApplicationType;
 }>;
 
 export enum DChatApplicationType {
-  BIZ = 'BIZ',
-  MALL = 'MALL',
+  DROPPII = 'DROPPII',
+  OBEFE = 'OBEFE',
 }
 
 export enum DChatCategory {
@@ -40,11 +41,6 @@ export enum DChatCategory {
   BIZ_BOT_CRM = 'BIZ_BOT_CRM',
 }
 
-export enum DChatType {
-  SINGLE = 'SINGLE',
-  GROUP = 'GROUP',
-}
-
 export enum DMemberRole {
   AGENT = 'AGENT',
   MEMBER = 'MEMBER',
@@ -65,11 +61,11 @@ export interface DConversationPeer {
   group: null; // to be defined when group is implemented
 }
 
-export interface DConversationItem {
+export interface DConversationItem extends ConversationItem {
   // Droppii API fields
   conversationId: string;
   chatCategory: DChatCategory;
-  chatType: DChatType;
+  chatType: PeerType;
   applicationType: string;
   memberRole: DMemberRole;
   pinnedAt: string | null;
@@ -77,23 +73,6 @@ export interface DConversationItem {
   peer: DConversationPeerUser;
   // Merged from OpenIM (available after getConversationListSplit merge)
   lastMessage?: DMessageItem;
-  unreadCount?: number;
-  conversationType?: SessionType;
-  userID?: string;
-  groupID?: string;
-  showName?: string;
-  faceURL?: string;
-  recvMsgOpt?: MessageReceiveOptType;
-  groupAtType?: GroupAtType;
-  latestMsgSendTime?: number;
-  draftText?: string;
-  draftTextTime?: number;
-  isPinned?: boolean;
-  isNotInGroup?: boolean;
-  isPrivateChat?: boolean;
-  isMsgDestruct?: boolean;
-  attachedInfo?: string;
-  ex?: string;
 }
 
 export interface DConversationQueryParams {
@@ -134,3 +113,25 @@ export interface DMessagePushInfoEx {
   title: string;
   desc: string;
 }
+
+export interface IMessageItemEx {
+  applicationType: DChatApplicationType;
+  sessionId?: string;
+  messageInfo?: {
+    type: 'MESSAGE_INFO';
+    data: 'rich_text';
+    content: string;
+  };
+  urlMetadata?: IUrlMetadata;
+}
+
+export interface MessageStore {
+  messages: DMessageItem[];
+  hasMoreEarlier: boolean;
+  hasMoreNewer: boolean;
+  setMessages: (messages: DMessageItem[], hasMore: boolean) => void;
+  pushNewMessage: (message: MessageItem) => void;
+  updateOneMessage: (message: MessageItem) => void;
+  deleteOneMessage: (clientMsgID: string) => void;
+  reset: () => void;
+}

package/src/types/common.ts

@@ -2,4 +2,5 @@ export interface IUrlMetadata {
   title?: string;
   description?: string;
   image?: string;
+  url?: string;
 }

package/src/utils/conversation.ts

@@ -1,8 +1,10 @@
 import {
+  MessageType,
   SessionType,
   type ConversationItem,
 } from '@droppii/openim-rn-client-sdk';
 import { type DConversationItem, type DMessageItem } from '../types/chat';
+import { trans } from '../translation';
 
 export const conversationCompare = (
   a: ConversationItem,
@@ -26,38 +28,37 @@ export const dConversationCompare = (
   a: DConversationItem,
   b: DConversationItem
 ) => {
-  const aIsPinned = a.pinnedAt != null;
-  const bIsPinned = b.pinnedAt != null;
-
-  if (aIsPinned !== bIsPinned) return aIsPinned ? -1 : 1;
+  if (a.isPinned !== b.isPinned) return a.isPinned ? -1 : 1;
 
-  const aCreateTime = a.lastMessage?.createTime ?? 0;
-  const bCreateTime = b.lastMessage?.createTime ?? 0;
+  const aTime =
+    a.draftTextTime > a.latestMsgSendTime
+      ? a.draftTextTime
+      : a.latestMsgSendTime;
+  const bTime =
+    b.draftTextTime > b.latestMsgSendTime
+      ? b.draftTextTime
+      : b.latestMsgSendTime;
 
-  return bCreateTime - aCreateTime;
+  return bTime - aTime;
 };
 
 export const mergeOpenIMIntoConversation = (
-  droppii: DConversationItem,
+  existing: DConversationItem,
   openim: ConversationItem
 ): DConversationItem => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { latestMsg, conversationID, ...openimRest } = openim;
+  const { latestMsg, ...openimRest } = openim;
 
-  let lastMessage: DMessageItem | undefined = droppii.lastMessage;
+  let lastMessage: DMessageItem | undefined = existing.lastMessage;
   if (latestMsg) {
     try {
       lastMessage = JSON.parse(latestMsg) as DMessageItem;
     } catch {
-      // keep droppii lastMessage if parse fails
+      // keep existing lastMessage if parse fails
     }
   }
 
-  return {
-    ...droppii,
-    ...openimRest,
-    lastMessage,
-  };
+  // Spread existing first so peerType (not in ConversationItem) is preserved
+  return { ...existing, ...openimRest, lastMessage };
 };
 
 export const getConversationID = (
@@ -81,3 +82,29 @@ export const sortConversation = (map: Record<string, DConversationItem>) => {
   );
   return { map, list };
 };
+
+export const generateContentBasedOnMessageType = (
+  contentType: MessageType,
+  plainText?: string
+) => {
+  switch (contentType) {
+    case MessageType.TextMessage:
+    case MessageType.QuoteMessage:
+    case MessageType.LogTextMessage:
+      return plainText || '';
+    case MessageType.PictureMessage:
+      return trans('msg_type_image');
+    case MessageType.VoiceMessage:
+      return trans('msg_type_voice');
+    case MessageType.VideoMessage:
+      return trans('msg_type_video');
+    case MessageType.FileMessage:
+      return trans('msg_type_file');
+    case MessageType.UrlTextMessage:
+      return trans('msg_type_link');
+    case MessageType.RevokeMessage:
+      return trans('revoked');
+    default:
+      return '';
+  }
+};

package/src/utils/legendListMessage.ts

@@ -1,7 +1,5 @@
 import { MessageType } from '@droppii/openim-rn-client-sdk';
 import type { DMessageItem } from '../types/chat';
-import { resolveChatMessageType } from './resolveMessageType';
-import type { DChatMessageType } from '../types/message';
 
 /**
  * Extract message text based on content type
@@ -41,7 +39,6 @@ export const getMessageText = (message: DMessageItem): string => {
 export interface PrecomputedMessageData {
   messageId: string;
   dayStart: boolean;
-  messageType: DChatMessageType;
   createdAt: number;
 }
 
@@ -66,12 +63,10 @@ export const precomputeLegendListData = (
 
     const createdAt = message.sendTime || message.createTime;
     const day = new Date(createdAt).getDate();
-    const messageType = resolveChatMessageType(message);
 
     dataMap.set(messageId, {
       messageId,
       dayStart: lastDay !== day,
-      messageType,
       createdAt,
     });
 

package/src/utils/message.ts

@@ -1,9 +1,9 @@
-import { SessionType, type MessageItem } from '@droppii/openim-rn-client-sdk';
 import {
-  DChatType,
-  type DConversationItem,
-  type DMessageItem,
-} from '../types/chat';
+  PeerType,
+  SessionType,
+  type MessageItem,
+} from '@droppii/openim-rn-client-sdk';
+import { type DConversationItem, type DMessageItem } from '../types/chat';
 import { getConversationID } from './conversation';
 
 const getMessageTime = (message: DMessageItem) =>
@@ -129,14 +129,12 @@ export const belongsToConversation = (
 export const getReceiverId = (conversation?: DConversationItem) => {
   if (conversation == null) return { groupID: '', recvID: '' };
 
-  const isGroupChat = conversation.chatType === DChatType.GROUP;
-  if (isGroupChat) {
-    const isBot = conversation.chatCategory?.includes('BOT');
-    const groupID = isBot
-      ? conversation.conversationId?.slice(3) // Remove sg_
-      : conversation.groupID;
+  if (conversation.peerType === PeerType.Group) {
+    // Group conversation: groupID is embedded after the "sg_" prefix
+    const groupID =
+      conversation.groupID || conversation.conversationID.slice(3);
     return { groupID: groupID ?? '', recvID: '' };
   }
 
-  return { groupID: '', recvID: conversation.peer.id ?? '' };
+  return { groupID: '', recvID: conversation.userID ?? '' };
 };

package/src/utils/url.ts

@@ -1,5 +1,5 @@
-const URL_REGEX = /https?:\/\/[^\s]+/i;
+const URL_REGEX = /\bhttps?:\/\/[^\s<>"']*[^\s<>"',.!?()\[\]{}]/g;
 
-export function extractFirstUrl(text: string): string | undefined {
-  return text.match(URL_REGEX)?.[0];
+export function extractUrls(text: string): string[] {
+  return text.match(URL_REGEX) ?? [];
 }