@droppii-org/chat-mobile 0.2.18 → 0.2.20

package/src/types/chat.ts

@@ -1,8 +1,4 @@
-import {
-  type MessageItem,
-  type ConversationItem,
-  PeerType,
-} from '@droppii/openim-rn-client-sdk';
+import { type MessageItem } from '@droppii/openim-rn-client-sdk';
 import type { PropsWithChildren } from 'react';
 import type { IUrlMetadata } from './common';
 import type {
@@ -10,6 +6,7 @@ import type {
   IConversationFlowStep,
   IRunConversationFlowPayload,
 } from './flows';
+import type { GetOpenIMTokenResponse } from './auth';
 
 export const EventProvider = {
   ga: 'ga',
@@ -31,6 +28,7 @@ export interface ChatContextType {
 export type ChatProviderProps = PropsWithChildren<{
   logGA?: LogGA;
   applicationType: DChatApplicationType;
+  getChatToken: () => Promise<GetOpenIMTokenResponse | null>;
 }>;
 
 export enum DChatApplicationType {
@@ -66,20 +64,6 @@ export interface DConversationPeer {
   group: null; // to be defined when group is implemented
 }
 
-export interface DConversationItem extends ConversationItem {
-  // Droppii API fields
-  conversationId: string;
-  chatCategory: DChatCategory;
-  chatType: PeerType;
-  applicationType: DChatApplicationType;
-  memberRole: DMemberRole;
-  pinnedAt: string | null;
-  isMuted: boolean;
-  peer: DConversationPeerUser;
-  // Merged from OpenIM (available after getConversationListSplit merge)
-  lastMessage?: DMessageItem;
-}
-
 export interface DConversationQueryParams {
   applicationType: string;
   page: number;
@@ -146,7 +130,19 @@ export interface ChatDetailContextType {
   conversationFlow?: IConversationFlow;
   refetchConversationFlow: () => void;
   isBotConversation: boolean;
-  setConverationFlowStep: (step: IConversationFlowStep) => void;
+  setConverationFlowStep: (step?: IConversationFlowStep) => void;
 }
 
 export interface ChatDetailProviderProps extends PropsWithChildren {}
+
+export interface IConversationItemEx {
+  applicationType: DChatApplicationType;
+  sessionInfo?: {
+    type: 'SESSION_INFO';
+    data: {
+      ownerId: string;
+      botId: string;
+    };
+  };
+  chatCategory: DChatCategory;
+}

package/src/utils/conversation.ts

@@ -3,7 +3,6 @@ import {
   SessionType,
   type ConversationItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DConversationItem, type DMessageItem } from '../types/chat';
 import { trans } from '../translation';
 
 export const conversationCompare = (
@@ -24,43 +23,6 @@ export const conversationCompare = (
   return bCompare - aCompare;
 };
 
-export const dConversationCompare = (
-  a: DConversationItem,
-  b: DConversationItem
-) => {
-  if (a.isPinned !== b.isPinned) return a.isPinned ? -1 : 1;
-
-  const aTime =
-    a.draftTextTime > a.latestMsgSendTime
-      ? a.draftTextTime
-      : a.latestMsgSendTime;
-  const bTime =
-    b.draftTextTime > b.latestMsgSendTime
-      ? b.draftTextTime
-      : b.latestMsgSendTime;
-
-  return bTime - aTime;
-};
-
-export const mergeOpenIMIntoConversation = (
-  existing: DConversationItem,
-  openim: ConversationItem
-): DConversationItem => {
-  const { latestMsg, ...openimRest } = openim;
-
-  let lastMessage: DMessageItem | undefined = existing.lastMessage;
-  if (latestMsg) {
-    try {
-      lastMessage = JSON.parse(latestMsg) as DMessageItem;
-    } catch {
-      // keep existing lastMessage if parse fails
-    }
-  }
-
-  // Spread existing first so peerType (not in ConversationItem) is preserved
-  return { ...existing, ...openimRest, lastMessage };
-};
-
 export const getConversationID = (
   sessionType: SessionType,
   senderID?: string,
@@ -76,9 +38,9 @@ export const getConversationID = (
   return [prefix, senderID, receiverID].filter(Boolean).join('_');
 };
 
-export const sortConversation = (map: Record<string, DConversationItem>) => {
+export const sortConversation = (map: Record<string, ConversationItem>) => {
   const list = Object.keys(map).sort((a, b) =>
-    dConversationCompare(map[a]!, map[b]!)
+    conversationCompare(map[a]!, map[b]!)
   );
   return { map, list };
 };

package/src/utils/message.ts

@@ -1,9 +1,10 @@
 import {
   PeerType,
   SessionType,
+  type ConversationItem,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DConversationItem, type DMessageItem } from '../types/chat';
+import { type DMessageItem } from '../types/chat';
 import { getConversationID } from './conversation';
 
 const getMessageTime = (message: DMessageItem) =>
@@ -126,7 +127,7 @@ export const belongsToConversation = (
   }
 };
 
-export const getReceiverId = (conversation?: DConversationItem) => {
+export const getReceiverId = (conversation?: ConversationItem) => {
   if (conversation == null) return { groupID: '', recvID: '' };
 
   if (conversation.peerType === PeerType.Group) {

package/src/utils/messageUtils.ts

@@ -2,7 +2,11 @@
  * Message formatting and preview utilities
  */
 
-import { MessageType } from '@droppii/openim-rn-client-sdk';
+import {
+  MessageType,
+  PeerType,
+  type ConversationItem,
+} from '@droppii/openim-rn-client-sdk';
 import type { DMessageItem } from '../types/chat';
 import { DChatMessageType } from '../types/message';
 import { formatDuration } from './dateTimeUtils';
@@ -86,7 +90,6 @@ export const getMessagePreview = (message: DMessageItem): string => {
       // Preview link message - show with [Link] prefix
       const urlText =
         message?.urlTextElem?.content || message?.urlTextElem?.urls?.[0] || '';
-      console.log('message', urlText);
       return urlText ? `[Link] ${urlText}` : '[Link]';
 
     case MessageType.AtTextMessage:
@@ -100,7 +103,8 @@ export const getMessagePreview = (message: DMessageItem): string => {
 
 export const getLastMessageText = (
   message: DMessageItem | undefined,
-  currentUserId?: string
+  currentUserId?: string,
+  conversation?: ConversationItem
 ): string => {
   if (!message) return '';
 
@@ -117,5 +121,9 @@ export const getLastMessageText = (
     return `${message.senderNickname}: ${preview}`;
   }
 
+  if (conversation?.peerType === PeerType.Bot) {
+    return `${conversation?.showName || ''}: ${preview}`;
+  }
+
   return preview;
 };