@droppii-org/chat-mobile 0.2.37 → 0.2.38

package/src/screens/chat-detail/types.ts

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import type { MediaItem } from '../../hooks/useMediaViewer';
-import type { DMessageItem } from '../../types/chat';
 import type { MeasuredRect } from './messageToolbox/types';
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 
 export type DChatActionIconProvider = 'MaterialCommunityIcons' | 'DroppiiNew';
 
@@ -70,9 +70,9 @@ export interface ChatComposerProps {
 }
 
 export interface ChatListProps {
-  messages?: DMessageItem[];
+  messages?: MessageItem[];
   currentUserId?: string;
-  customMessageItemFactory?: (item: DMessageItem) => ReactNode;
+  customMessageItemFactory?: (item: MessageItem) => ReactNode;
   onLoadEarlier?: () => void;
   isLoading?: boolean;
   isLoadingEarlier?: boolean;
@@ -82,7 +82,7 @@ export interface ChatListProps {
   hasMoreNewer?: boolean;
   onMediaPress?: (items: MediaItem[], index?: number) => void;
   onPressUrl?: (url: string) => void;
-  onLongPress?: (message: DMessageItem, rect: MeasuredRect) => void;
+  onLongPress?: (message: MessageItem, rect: MeasuredRect) => void;
 }
 
 export interface ChatDetailProps extends Omit<
@@ -96,6 +96,6 @@ export interface ChatDetailProps extends Omit<
   enabled?: boolean;
   showAddMember?: boolean;
   onPressUrl?: (url: string) => void;
-  customMessageItemFactory?: (item: DMessageItem) => ReactNode;
+  customMessageItemFactory?: (item: MessageItem) => ReactNode;
   pannelActions?: DChatPannelAction[];
 }

package/src/screens/inbox/Inbox.tsx

@@ -3,8 +3,6 @@ import { StyleSheet } from 'react-native';
 import { TabView } from 'react-native-tab-view';
 import { KContainer, KImage, KLabel, KColors } from '@droppii/libs';
 import { MessagesTab } from './MessagesTab';
-import { useUserStore } from '../../store';
-import { LoginStatus } from '@droppii/openim-rn-client-sdk';
 
 interface InboxProps {
   onPressThread?: (item: string) => void;
@@ -17,7 +15,6 @@ type TabRoute = { key: string; title: string };
 
 const Inbox = memo(
   ({ onPressThread, onPressSearch, onPressEdit, onPressGroup }: InboxProps) => {
-    const connectStatus = useUserStore((state) => state.connectStatus);
     const [index, setIndex] = useState(0);
     const [routes] = useState<TabRoute[]>([
       { key: 'messages', title: 'Tin nhắn' },
@@ -25,13 +22,12 @@ const Inbox = memo(
 
     const renderScene = useCallback(
       ({ route }: { route: TabRoute }) => {
-        if (connectStatus !== LoginStatus.Logged) return null;
         if (route.key === 'messages') {
           return <MessagesTab onPressThread={onPressThread} />;
         }
         return null;
       },
-      [onPressThread, connectStatus]
+      [onPressThread]
     );
 
     const renderTabBar = useCallback(

package/src/services/apis.ts

@@ -17,8 +17,4 @@ export namespace ChatAPI {
     useConversationStore.getState().reset();
     return OpenIMSDK.logout(operationID);
   };
-
-  export const getUser = async (operationID?: string | undefined) => {
-    return OpenIMSDK.getSelfUserInfo(operationID);
-  };
 }

package/src/services/message.ts

@@ -3,7 +3,6 @@ import OpenIMSDK, {
   type AdvancedGetMessageResult,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem } from '../types/chat';
 import { useConversationStore } from '../store';
 import { getReceiverId } from '../utils/message';
 
@@ -34,7 +33,7 @@ export namespace ChatMessageAPI {
 
   export async function sendTextMessage(params: {
     text: string;
-  }): Promise<DMessageItem> {
+  }): Promise<MessageItem> {
     const currentConversation = useConversationStore
       .getState()
       .getCurrentConversation();

package/src/store/message.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { MessageType } from '@droppii/openim-rn-client-sdk';
 import type { MessageItem } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem, MessageStore } from '../types/chat';
+import type { MessageStore } from '../types/chat';
 import { mergeMessages } from '../utils/message';
 
 export const useMessageStore = create<MessageStore>()((set, get) => ({
@@ -15,7 +15,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
 
   pushNewMessage: (message: MessageItem) => {
     set((state) => ({
-      messages: mergeMessages(state.messages, [message as DMessageItem]),
+      messages: mergeMessages(state.messages, [message]),
     }));
   },
 
@@ -25,7 +25,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
       (msg) => msg.clientMsgID === message.clientMsgID
     );
     if (idx < 0) return;
-    tmpList[idx] = { ...tmpList[idx]!, ...message } as DMessageItem;
+    tmpList[idx] = { ...tmpList[idx]!, ...message };
     set({ messages: tmpList });
   },
 

package/src/store/pinnedMessage.ts

@@ -1,11 +1,11 @@
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 import { create } from 'zustand';
-import type { DMessageItem } from '../types/chat';
 
 export interface PinnedMessageStore {
-  messages: DMessageItem[];
+  messages: MessageItem[];
   totalCount: number;
-  setMessages: (messages: DMessageItem[], totalCount: number) => void;
-  addMessage: (message: DMessageItem) => void;
+  setMessages: (messages: MessageItem[], totalCount: number) => void;
+  addMessage: (message: MessageItem) => void;
   removeMessage: (clientMsgID: string) => void;
   reset: () => void;
 }

package/src/store/user.ts

@@ -1,18 +1,18 @@
 import { create } from 'zustand';
-import { LoginStatus, type SelfUserInfo } from '@droppii/openim-rn-client-sdk';
-import { SyncStatus } from '../types/auth';
+import { type SelfUserInfo } from '@droppii/openim-rn-client-sdk';
+import { ConnectStatus, SyncStatus } from '../types/chat';
 
 export interface UserStore {
   user?: SelfUserInfo;
   setUser: (user: SelfUserInfo) => void;
-  connectStatus: LoginStatus;
-  updateConnectStatus: (status: LoginStatus) => void;
+  connectStatus: ConnectStatus;
+  updateConnectStatus: (status: ConnectStatus) => void;
   syncStatus: SyncStatus;
   updateSyncStatus: (status: SyncStatus) => void;
 }
 
 export const useUserStore = create<UserStore>()((set) => ({
-  connectStatus: LoginStatus.Logout,
+  connectStatus: ConnectStatus.Disconnected,
   syncStatus: SyncStatus.Loading,
   setUser(user) {
     set({ user });

package/src/translation/resources/i18n.ts

@@ -76,6 +76,10 @@ const i18nKey: Record<string, string> = {
   'send_order': 'Gửi đơn hàng',
   'send_product': 'Gửi sản phẩm',
   'create_appointment': 'Tạo lịch hẹn',
+  'chat:reply_message': 'Trả lời',
+  'chat:reply_to': 'Trả lời {{name}}',
+  'yourself': 'chính mình',
+  'you': 'Bạn',
 };
 
 export default {

package/src/types/auth.ts

@@ -18,9 +18,3 @@ export type GetOpenIMTokenResponse = {
   token: string;
   expiresIn: number;
 };
-
-export enum SyncStatus {
-  Loading = 0,
-  Success = 1,
-  Failed = 2,
-}

package/src/types/chat.ts

@@ -37,6 +37,7 @@ export interface ChatContextType {
   onPressFlashMessage?: (message: ConversationItem) => void;
   isShowFLashMessage: boolean;
   setIsShowFLashMessage: (value: boolean) => void;
+  handleLoginSdk: () => void;
 }
 
 export type ChatProviderProps = PropsWithChildren<{
@@ -98,6 +99,18 @@ export interface DBotStatus {
   botSupportPlatform: unknown | null;
 }
 
+export enum SyncStatus {
+  Loading = 0,
+  Success = 1,
+  Failed = 2,
+}
+
+export enum ConnectStatus {
+  Disconnected = 0,
+  Connected = 1,
+  Connecting = 2,
+}
+
 export interface DConversationPeerUser {
   id: string;
   username?: string;
@@ -119,42 +132,6 @@ export interface DConversationQueryParams {
   pageSize: number;
 }
 
-export interface DMessageItem extends MessageItem {
-  isInternal?: boolean;
-  atUserIDList?: unknown;
-  attachedInfo?: 'null';
-  options?: DMessageOption;
-  isPinned?: boolean;
-  pinnedByUserID?: string;
-  pinnedTime?: number;
-}
-
-export interface DMessageOption {
-  conversationUpdate: boolean;
-  offlinePush: boolean;
-  senderConversationUpdate: boolean;
-  unreadCount: boolean;
-}
-
-export interface DMessagePushInfo {
-  title: string;
-  desc: string;
-  /**
-   * @instance DMessagePushInfoEx
-   */
-  ex: string;
-  signalInfo: string;
-  iospushSound: 'default';
-  iosbadgeCount: boolean;
-}
-
-export interface DMessagePushInfoEx {
-  icon: string; // url
-  conversationId: string;
-  title: string;
-  desc: string;
-}
-
 export interface IMessageItemEx {
   applicationType: DChatApplicationType;
   sessionId?: string;
@@ -168,13 +145,13 @@ export interface IMessageItemEx {
 }
 
 export interface MessageStore {
-  messages: DMessageItem[];
+  messages: MessageItem[];
   hasMoreEarlier: boolean;
   hasMoreNewer: boolean;
-  setMessages: (messages: DMessageItem[], hasMore: boolean) => void;
+  setMessages: (messages: MessageItem[], hasMore: boolean) => void;
   pushNewMessage: (message: MessageItem) => void;
   updateOneMessage: (
-    message: Partial<DMessageItem> & Pick<MessageItem, 'clientMsgID'>
+    message: Partial<MessageItem> & Pick<MessageItem, 'clientMsgID'>
   ) => void;
   deleteOneMessage: (clientMsgID: string) => void;
   reset: () => void;
@@ -182,12 +159,13 @@ export interface MessageStore {
 
 export interface ChatDetailContextType {
   conversationFlow?: IConversationFlow;
-  refetchConversationFlow: () => void;
   isBotConversation: boolean;
   setConverationFlowStep: (step?: IConversationFlowStep) => void;
   flowState?: DFlowState;
   runButtonContext: (stringContext: DFlowContext) => Promise<boolean>;
   conversation?: ConversationItem;
+  quotedMessage?: MessageItem;
+  setQuotedMessage: (item?: MessageItem) => void;
 }
 
 export interface ChatDetailProviderProps extends PropsWithChildren {}

package/src/utils/legendListMessage.ts

@@ -1,10 +1,9 @@
-import { MessageType } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem } from '../types/chat';
+import { MessageType, type MessageItem } from '@droppii/openim-rn-client-sdk';
 
 /**
  * Extract message text based on content type
  */
-export const getMessageText = (message: DMessageItem): string => {
+export const getMessageText = (message: MessageItem): string => {
   switch (message.contentType) {
     case MessageType.TextMessage:
       return message.textElem?.content ?? message.content;
@@ -49,7 +48,7 @@ export interface PrecomputedMessageData {
  * Returns: Map of messageId -> {dayStart, messageType, createdAt}
  */
 export const precomputeLegendListData = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): Map<string, PrecomputedMessageData> => {
   const dataMap = new Map<string, PrecomputedMessageData>();
   let lastDay: number | null = null;
@@ -81,7 +80,7 @@ export const precomputeLegendListData = (
  * Kept for backward compatibility
  */
 export const computeDayStarts = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): Map<string, boolean> => {
   const dayStartMap = new Map<string, boolean>();
   let lastDay: number | null = null;

package/src/utils/message.ts

@@ -4,20 +4,19 @@ import {
   type ConversationItem,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DMessageItem } from '../types/chat';
 import { getConversationID } from './conversation';
 
-const getMessageTime = (message: DMessageItem) =>
+const getMessageTime = (message: MessageItem) =>
   message.sendTime || message.createTime || 0;
 
-const getMessageKey = (message: DMessageItem) =>
+const getMessageKey = (message: MessageItem) =>
   message.clientMsgID || message.serverMsgID;
 
 export const mergeMessages = (
-  current: DMessageItem[],
-  incoming: DMessageItem[]
-): DMessageItem[] => {
-  const map = new Map<string, DMessageItem>();
+  current: MessageItem[],
+  incoming: MessageItem[]
+): MessageItem[] => {
+  const map = new Map<string, MessageItem>();
 
   for (const message of [...current, ...incoming]) {
     const key = getMessageKey(message);
@@ -54,7 +53,7 @@ export type HistoryPaginationAnchor = {
 
 export const resolveHistoryLastMinSeq = (
   history: { lastMinSeq?: number },
-  fallbackMessage?: DMessageItem
+  fallbackMessage?: MessageItem
 ): number => {
   if (history.lastMinSeq != null) {
     return history.lastMinSeq;
@@ -64,7 +63,7 @@ export const resolveHistoryLastMinSeq = (
 };
 
 export const getHistoryPaginationAnchor = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): HistoryPaginationAnchor | null => {
   if (!messages.length) {
     return null;
@@ -86,8 +85,8 @@ export const getHistoryPaginationAnchor = (
 };
 
 export const hasNewHistoryMessages = (
-  current: DMessageItem[],
-  incoming: DMessageItem[]
+  current: MessageItem[],
+  incoming: MessageItem[]
 ): boolean => {
   const currentKeys = new Set(
     current.map((message) => getMessageKey(message)).filter(Boolean)

package/src/utils/messageUtils.ts

@@ -6,17 +6,17 @@ import {
   MessageType,
   PeerType,
   type ConversationItem,
+  type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DMessageItem } from '../types/chat';
-import type { IUrlMetadata } from '../types/common';
 import { formatDuration } from './dateTimeUtils';
 import { getFileIcon, getMimeType } from './imageUtils';
 import { trans } from '../translation';
+import type { IUrlMetadata } from '../types/common';
 
-export const isMessageRevoked = (message: DMessageItem): boolean =>
+export const isMessageRevoked = (message: MessageItem): boolean =>
   message.contentType === MessageType.RevokeMessage;
 
-export const extractTextContent = (message: DMessageItem): string => {
+export const extractTextContent = (message: MessageItem): string => {
   if (message.textElem?.content) return message.textElem.content;
   try {
     const parsed = JSON.parse(message.content) as { content?: string };
@@ -26,7 +26,8 @@ export const extractTextContent = (message: DMessageItem): string => {
   }
 };
 
-export const getMessagePreview = (message: DMessageItem): string => {
+export const getMessagePreview = (message?: MessageItem): string => {
+  if (!message) return '';
   // Handle standard message types
   switch (message.contentType) {
     case MessageType.TextMessage:
@@ -78,9 +79,11 @@ export const getMessagePreview = (message: DMessageItem): string => {
       return urlText ? urlText : '';
 
     case MessageType.AtTextMessage:
-    case MessageType.QuoteMessage:
       return extractTextContent(message);
 
+    case MessageType.QuoteMessage:
+      return message?.quoteElem?.text || '';
+
     case MessageType.RevokeMessage:
       return trans('msg_type_revoke');
 
@@ -110,7 +113,7 @@ const getImageUrl = (pictureElem: any): string | undefined =>
 
 // Link messages carry their rich-preview metadata (title/description/image)
 // as a JSON string in `ex`, set by useSendMessage's IMessageItemEx payload.
-const getUrlMetadata = (message: DMessageItem): IUrlMetadata | undefined => {
+const getUrlMetadata = (message: MessageItem): IUrlMetadata | undefined => {
   if (!message.ex) return undefined;
   try {
     const parsed = JSON.parse(message.ex) as { urlMetadata?: IUrlMetadata };
@@ -121,7 +124,7 @@ const getUrlMetadata = (message: DMessageItem): IUrlMetadata | undefined => {
 };
 
 export const getPinnedMessagePreview = (
-  message: DMessageItem
+  message: MessageItem
 ): PinnedMessagePreview => {
   switch (message.contentType) {
     case MessageType.PictureMessage: {
@@ -183,7 +186,7 @@ export const getPinnedMessagePreview = (
 };
 
 export const getLastMessageText = (
-  message: DMessageItem | undefined,
+  message: MessageItem | undefined,
   currentUserId?: string,
   conversation?: ConversationItem
 ): string => {
@@ -205,3 +208,28 @@ export const getLastMessageText = (
     ? trans('chat:revoked_by_sender', { sender })
     : `${sender}: ${preview}`;
 };
+
+export const getReplySenderName = (
+  message?: MessageItem,
+  currentUserId?: string,
+  conversation?: ConversationItem,
+  isSent?: boolean
+): string => {
+  if (!message) return '';
+  if (currentUserId && message.sendID === currentUserId)
+    return trans(isSent ? 'you' : 'yourself');
+  return conversation?.peerType === PeerType.Bot
+    ? conversation?.showName || ''
+    : message?.senderNickname || '';
+};
+
+export const parseUrlMetadata = (ex?: string): IUrlMetadata | undefined => {
+  if (!ex) return undefined;
+  try {
+    const parsed = JSON.parse(ex) as any;
+    // Handle nested urlMetadata structure
+    return parsed?.urlMetadata || undefined;
+  } catch {
+    return undefined;
+  }
+};