@droppii-org/chat-mobile 0.2.57 → 0.2.58

package/src/screens/SearchConversation/types.tsx

@@ -0,0 +1,5 @@
+export enum SearchConversationTabResultType {
+  All = 'all',
+  Conversations = 'conversations',
+  Messages = 'messages',
+}

package/src/screens/chat-detail/ChatDetail.tsx

@@ -41,6 +41,7 @@ const ChatDetail = memo(
     targetUserId = '',
     targetGroupId = '',
     targetBotId = '',
+    targetMessageId = '',
     showAddMember,
     onBack,
     onPressSearch,
@@ -91,7 +92,7 @@ const ChatDetail = memo(
       getMoreNewMessages,
       hasMoreOld,
       hasMoreNew,
-    } = useMessages({ conversationId });
+    } = useMessages({ conversationId, startClientMsgId: targetMessageId });
 
     const setShowFLashMessage = useSetIsShowFLashMessage();
 

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

@@ -94,6 +94,7 @@ export interface ChatDetailProps extends Omit<
   targetUserId?: string;
   targetGroupId?: string;
   targetBotId?: string;
+  targetMessageId?: string;
   enabled?: boolean;
   showAddMember?: boolean;
   onPressUrl?: (url: string) => void;

package/src/services/endpoints.ts

@@ -38,6 +38,7 @@ export const ENDPOINTS = {
     stickersByCategoryId: (id: string) =>
       `${getApiEndpoint('stickersByCategory')}/${id}/stickers`,
     stickerHistory: () => getApiEndpoint('stickerHistory'),
+    searchMessages: () => `${getApiEndpoint('messages')}/search`,
   },
   uploaderService: {
     get uploadImage() {

package/src/translation/resources/i18n.ts

@@ -118,6 +118,13 @@ const i18nKey: Record<string, string> = {
     'Bạn đang trong phiên hỗ trợ với hỗ trợ viên, bạn có muốn <bold>kết thúc phiên hỗ trợ</bold> ngay bây giờ?',
   'chat:end_support_session_primary': 'Kết thúc',
   'chat:end_support_session_secondary': 'Tiếp tục',
+  'search': 'Tìm kiếm',
+  'all': 'Tất cả',
+  'contacts': 'Liên hệ',
+  'messages': 'Tin nhắn',
+  'search:empty_description':
+    'Không tìm thấy kết quả nào\nHãy thử lại với cách viết hoặc kết hợp cụm từ khác phù hợp hơn.',
+  'view_all': 'Xem tất cả',
 };
 
 export default {

package/src/types/chat.ts

@@ -1,4 +1,5 @@
 import {
+  MessageType,
   type ConversationItem,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
@@ -317,3 +318,17 @@ export interface DThreadResourceRawRow {
   tag: unknown;
   displayTag: unknown;
 }
+
+export type ISearchMessagesRequest = {
+  conversationId?: string;
+  contentTypes: MessageType[];
+  page: number;
+  pageSize: number;
+  applicationType: DChatApplicationType;
+  searchTerm: string;
+};
+
+export interface ISearchMessageItem {
+  chatLog: MessageItem;
+  conversation: ConversationItem;
+}

package/src/utils/messageUtils.ts

@@ -20,10 +20,14 @@ export const isMessageRevoked = (message: MessageItem): boolean =>
 export const extractTextContent = (message: MessageItem): string => {
   if (message.textElem?.content) return message.textElem.content;
   try {
-    const parsed = JSON.parse(message.content) as { content?: string };
-    return parsed.content ?? '';
+    const parsed = JSON.parse(message.content) as {
+      content?: string;
+      text?: string;
+      description?: string;
+    };
+    return parsed?.content || parsed?.text || parsed?.description || '';
   } catch {
-    return message.content ?? '';
+    return message.content || '';
   }
 };
 
@@ -75,14 +79,17 @@ export const getMessagePreview = (message?: MessageItem): string => {
     case MessageType.UrlTextMessage:
       // Preview link message - show with [Link] prefix
       const urlText =
-        message?.urlTextElem?.content || message?.urlTextElem?.urls?.[0] || '';
+        message?.urlTextElem?.content ||
+        message?.urlTextElem?.urls?.[0] ||
+        extractTextContent(message) ||
+        '';
       return urlText ? urlText : '';
 
     case MessageType.AtTextMessage:
       return extractTextContent(message);
 
     case MessageType.QuoteMessage:
-      return message?.quoteElem?.text || '';
+      return message?.quoteElem?.text || extractTextContent(message) || '';
 
     case MessageType.RevokeMessage:
       return trans('msg_type_revoke');
@@ -91,7 +98,7 @@ export const getMessagePreview = (message?: MessageItem): string => {
       if (message?.customElem?.description) {
         return message?.customElem?.description;
       }
-      return '';
+      return extractTextContent(message) || '';
 
     case MessageType.StickerMessage:
       return '[Sticker]';