npm - @droppii-org/chat-mobile - Versions diffs - 0.2.66 → 0.2.68 - Mend

@droppii-org/chat-mobile 0.2.66 → 0.2.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (133) hide show

package/lib/module/components/messages/groupNotificationMessage/index.js ADDED Viewed

@@ -0,0 +1,25 @@
+"use strict";
+import { memo } from 'react';
+import { KLabel } from '@droppii/libs';
+import { trans } from "../../../translation/index.js";
+import { CHAT_BUBBLE_COLORS } from "../../../screens/chat-detail/constants.js";
+import { GROUP_NOTIFICATION_TEXT, getNotificationOpUserNickname } from "../../../utils/messageUtils.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+export const GroupNotificationMessage = /*#__PURE__*/memo(({
+  message,
+  isOutgoing
+}) => {
+  const notification = GROUP_NOTIFICATION_TEXT[message.contentType];
+  if (!notification) return null;
+  const sender = isOutgoing ? 'Bạn' : message.senderNickname || getNotificationOpUserNickname(message) || '';
+  return /*#__PURE__*/_jsx(KLabel.Text, {
+    typo: "TextXsNormal",
+    color: CHAT_BUBBLE_COLORS.dayLabel,
+    children: trans(notification.bySenderKey, {
+      sender
+    })
+  });
+});
+GroupNotificationMessage.displayName = 'GroupNotificationMessage';
+//# sourceMappingURL=index.js.map

package/lib/module/components/messages/groupNotificationMessage/index.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"names":["memo","KLabel","trans","CHAT_BUBBLE_COLORS","GROUP_NOTIFICATION_TEXT","getNotificationOpUserNickname","jsx","_jsx","GroupNotificationMessage","message","isOutgoing","notification","contentType","sender","senderNickname","Text","typo","color","dayLabel","children","bySenderKey","displayName"],"sourceRoot":"../../../../../src","sources":["components/messages/groupNotificationMessage/index.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,MAAM,QAAQ,eAAe;AACtC,SAASC,KAAK,QAAQ,+BAAsB;AAC5C,SAASC,kBAAkB,QAAQ,2CAAwC;AAC3E,SACEC,uBAAuB,EACvBC,6BAA6B,QACxB,gCAA6B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGrC,OAAO,MAAMC,wBAAwB,gBAAGR,IAAI,CAC1C,CAAC;EAAES,OAAO;EAAEC;AAAmC,CAAC,KAAK;EACnD,MAAMC,YAAY,GAAGP,uBAAuB,CAACK,OAAO,CAACG,WAAW,CAAC;EACjE,IAAI,CAACD,YAAY,EAAE,OAAO,IAAI;EAE9B,MAAME,MAAM,GAAGH,UAAU,GACrB,KAAK,GACLD,OAAO,CAACK,cAAc,IAAIT,6BAA6B,CAACI,OAAO,CAAC,IAAI,EAAE;EAE1E,oBACEF,IAAA,CAACN,MAAM,CAACc,IAAI;IAACC,IAAI,EAAC,cAAc;IAACC,KAAK,EAAEd,kBAAkB,CAACe,QAAS;IAAAC,QAAA,EACjEjB,KAAK,CAACS,YAAY,CAACS,WAAW,EAAE;MAAEP;IAAO,CAAC;EAAC,CACjC,CAAC;AAElB,CACF,CAAC;AAEDL,wBAAwB,CAACa,WAAW,GAAG,0BAA0B","ignoreList":[]}

package/lib/module/context/ChatContext.js CHANGED Viewed

@@ -96,7 +96,7 @@ export const ChatProvider = ({
   ...props
 }) => {
   const {
-    enabled = false
+    enabled = true
   } = props;
   if (!enabled) {
     return props.children;

package/lib/module/context/ChatContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useChatSdk","useSafeAreaInsets","uuid","useUserStore","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","isShowFLashMessage","setShow","handleLoginSdk","res","token","getState","setToken","loginStatus","getLoginStatus","id","Logout","login","userID","v4","userInfo","getSelfUserInfo","setUser","Logged","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props","enabled"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":"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~~EAAM~~,CAAC,GAAGD,KAAK;~~EAEjC~~,IAAI,CAACC,OAAO,EAAE;IACZ,OAAOD,KAAK,CAAClC,QAAQ;EACvB;EAEA,oBAAOZ,IAAA,CAACU,iBAAiB;IAAA,GAAKoC;EAAK,CAAG,CAAC;AACzC,CAAC","ignoreList":[]}
1	+ {"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useChatSdk","useSafeAreaInsets","uuid","useUserStore","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","isShowFLashMessage","setShow","handleLoginSdk","res","token","getState","setToken","loginStatus","getLoginStatus","id","Logout","login","userID","v4","userInfo","getSelfUserInfo","setUser","Logged","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props","enabled"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/context/ChatDetailContext.js CHANGED Viewed

@@ -114,4 +114,13 @@ export const ChatDetailProvider = ({
     children: children
   });
 };
+export function withChatDetailProvider(Component) {
+  const WithChatDetailProvider = props => /*#__PURE__*/_jsx(ChatDetailProvider, {
+    children: /*#__PURE__*/_jsx(Component, {
+      ...props
+    })
+  });
+  WithChatDetailProvider.displayName = `withChatDetailProvider(${Component.displayName || Component.name || 'Component'})`;
+  return WithChatDetailProvider;
+}
 //# sourceMappingURL=ChatDetailContext.js.map

package/lib/module/context/ChatDetailContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","DeviceEventEmitter","DFlowState","fechtCurrentConversationFlow","ChatEvent","useConversationStore","OpenIMSDK","PeerType","NodeTypes","useGetConversationFlowMainMenu","useRunFlow","CONTEXT_BUTTON_PREFIX","isContextButton","jsx","_jsx","ChatDetailContext","isBotConversation","conversationFlow","undefined","setConverationFlowStep","flowState","runButtonContext","Promise","resolve","conversation","quotedMessage","setQuotedMessage","groupPermissions","useChatDetailContext","context","Error","ChatDetailProvider","children","conversationId","state","currentConversationId","map","setConverationFlow","setGroupPermissions","groupId","groupID","getSelfUserInfo","then","info","permissions","catch","sub","addListener","GroupPermissionUpdated","remove","flowCurrentStep","data","some","n","type","LogicCsTeam","CS","BOT","peerType","Bot","conversationFlowMainMenu","mutateAsync","runFlow","step","isEnd","havingBotMessage","prev","flowIsEnd","getConversationFlow","res","stringContext","actionItem","find","f","label","trim","slice","length","actionId","id","childId","flowNextStep","Provider","value"],"sourceRoot":"../../../src","sources":["context/ChatDetailContext.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,WAAW,EACXC,UAAU,EACVC,SAAS,EACTC,OAAO,EACPC,QAAQ,~~QACH~~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","ignoreList":[]}
1	+ {"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","DeviceEventEmitter","DFlowState","fechtCurrentConversationFlow","ChatEvent","useConversationStore","OpenIMSDK","PeerType","NodeTypes","useGetConversationFlowMainMenu","useRunFlow","CONTEXT_BUTTON_PREFIX","isContextButton","jsx","_jsx","ChatDetailContext","isBotConversation","conversationFlow","undefined","setConverationFlowStep","flowState","runButtonContext","Promise","resolve","conversation","quotedMessage","setQuotedMessage","groupPermissions","useChatDetailContext","context","Error","ChatDetailProvider","children","conversationId","state","currentConversationId","map","setConverationFlow","setGroupPermissions","groupId","groupID","getSelfUserInfo","then","info","permissions","catch","sub","addListener","GroupPermissionUpdated","remove","flowCurrentStep","data","some","n","type","LogicCsTeam","CS","BOT","peerType","Bot","conversationFlowMainMenu","mutateAsync","runFlow","step","isEnd","havingBotMessage","prev","flowIsEnd","getConversationFlow","res","stringContext","actionItem","find","f","label","trim","slice","length","actionId","id","childId","flowNextStep","Provider","value","withChatDetailProvider","Component","WithChatDetailProvider","props","displayName","name"],"sourceRoot":"../../../src","sources":["context/ChatDetailContext.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/core/useChatListener.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
-import OpenIMSDK, { MessageReceiveOptType, MessageType, OpenIMEvent } from '@droppii/openim-rn-client-sdk';
+import OpenIMSDK, { MessageReceiveOptType, MessageType, OpenIMEvent, SessionType } from '@droppii/openim-rn-client-sdk';
+import { useQueryClient } from '@tanstack/react-query';
 import { useCallback, useEffect } from 'react';
 import { useConversationStore } from "../store/conversation.js";
 import { ToastFlashMessage } from "../utils/toastFlashMessage.js";
@@ -11,25 +12,29 @@ import isEmpty from 'lodash/isEmpty';
 import { markMessageRevoked, useMessageStore } from "../store/message.js";
 import { syncPinnedMessagesOnEvent } from "../hooks/message/usePinMessage.js";
 import { belongsToConversation } from "../utils/message.js";
+import { getConversationID } from "../utils/conversation.js";
 import { DeviceEventEmitter } from 'react-native';
 import { ChatEvent } from "../types/events.js";
+import { conversationQueryKeys } from "../hooks/query-keys.js";
 export const useChatListener = () => {
   const updateOneMessage = useMessageStore(state => state.updateOneMessage);
   const currentUserId = useUserStore(s => s.user?.userID);
   const onPressFlashMessage = useChatContext()?.onPressFlashMessage;
   const isShowFLashMessage = useChatContext()?.isShowFLashMessage;
+  const queryClient = useQueryClient();
   const onSendMessageProgress = useCallback(({
-    progress,
+    progress: _progress,
     message
   }) => {
-    console.log('[Listener] SendMessageProgress', {
-      clientMsgID: message.clientMsgID,
-      status: message.status,
-      progress
-    });
+    // console.log('[Listener] SendMessageProgress', {
+    //   clientMsgID: message.clientMsgID,
+    //   status: message.status,
+    //   progress,
+    // });
     updateOneMessage(message);
   }, [updateOneMessage]);
   const onConversationChanged = useCallback(conversations => {
+    // console.log('[Listener] OnConversationChanged', conversations);
     const oldMap = useConversationStore.getState().map;
     const visibleConversations = [];
     for (const conversation of conversations) {
@@ -59,22 +64,111 @@ export const useChatListener = () => {
     useConversationStore.getState().updateConversations(visibleConversations);
   }, [currentUserId, isShowFLashMessage, onPressFlashMessage]);
   const onNewConversation = useCallback(conversations => {
-    console.log('[Listener] OnNewConversation', conversations);
+    // console.log(
+    //   '[Listener] OnNewConversation',
+    //   conversations.map((c) => ({
+    //     conversationID: c.conversationID,
+    //     groupID: c.groupID,
+    //     isNotInGroup: c.isNotInGroup,
+    //     isGuardedRemoved: c.groupID
+    //       ? useConversationStore.getState().removedGroupIds.has(c.groupID)
+    //       : false,
+    //   }))
+    // );
     useConversationStore.getState().updateConversations(conversations);
   }, []);
+  const onGroupInfoChanged = useCallback(group => {
+    // console.log('[Listener] OnGroupInfoChanged', {
+    //   groupID: group.groupID,
+    //   memberCount: group.memberCount,
+    // });
+    queryClient.setQueryData(conversationQueryKeys.groupInfo(group.groupID), group);
+  }, [queryClient]);
   const onGroupMemberAdded = useCallback(member => {
-    console.log('[Listener] OnGroupMemberAdded', {
-      userID: member.userID,
-      groupID: member.groupID
+    // console.log('[Listener] OnGroupMemberAdded', {
+    //   userID: member.userID,
+    //   groupID: member.groupID,
+    //   isCurrentUser: member.userID === currentUserId,
+    // });
+    queryClient.invalidateQueries({
+      queryKey: conversationQueryKeys.groupInfo(member.groupID)
     });
-  }, []);
+    // The current user (re)joined this group — lift the removal guard so
+    // a future OnConversationChanged/OnNewConversation for it isn't dropped.
+    if (member.userID === currentUserId) {
+      useConversationStore.getState().restoreGroupConversation(member.groupID);
+    }
+  }, [queryClient, currentUserId]);
+  const removeGroupConversation = useCallback((groupID, groupName, reason) => {
+    // console.log('[Listener] removeGroupConversation', { groupID, reason });
+    // TEMPORARILY DISABLED: OnConversationChanged/OnNewConversation can
+    // still race this removal and resurrect the conversation before the
+    // removedGroupIds guard is proven reliable. Flip this back to `true`
+    // once that race is confirmed fixed.
+    const REMOVE_FLOW_ENABLED = false;
+    if (!REMOVE_FLOW_ENABLED) return;
+    const conversationID = getConversationID(SessionType.Group, groupID);
+    const conversation = useConversationStore.getState().map[conversationID];
+    const isCurrentConversation = useConversationStore.getState().currentConversationId === conversationID;
+    // Marks groupID as removed so any late-arriving conversation-sync event
+    // for it (see onConversationChanged/onNewConversation) is dropped
+    // instead of silently resurrecting the conversation we just removed.
+    useConversationStore.getState().removeGroupConversation(groupID);
+    queryClient.removeQueries({
+      queryKey: conversationQueryKeys.groupInfo(groupID)
+    });
+    ToastFlashMessage.show({
+      key: `group-removed-${groupID}`,
+      title: groupName || conversation?.showName || 'Nhóm',
+      body: reason === 'dismissed' ? 'Nhóm đã bị giải tán' : reason === 'kicked' ? 'Bạn đã bị mời khỏi nhóm' : 'Bạn không còn trong nhóm này'
+    });
+    if (isCurrentConversation) {
+      DeviceEventEmitter.emit(ChatEvent.GroupRemoved, {
+        groupID,
+        reason
+      });
+    }
+  }, [queryClient]);
   const onGroupMemberDeleted = useCallback(member => {
-    console.log('[Listener] OnGroupMemberDeleted', {
-      userID: member.userID,
-      groupID: member.groupID
+    // console.log('[Listener] OnGroupMemberDeleted', {
+    //   userID: member.userID,
+    //   groupID: member.groupID,
+    //   isCurrentUser: member.userID === currentUserId,
+    // });
+    queryClient.invalidateQueries({
+      queryKey: conversationQueryKeys.groupInfo(member.groupID)
     });
-  }, []);
+    // The removed member is the current user themselves — they were kicked,
+    // so their conversation for this group must be dropped like a leave/dismiss.
+    if (member.userID === currentUserId) {
+      removeGroupConversation(member.groupID, undefined, 'kicked');
+    }
+  }, [queryClient, currentUserId, removeGroupConversation]);
+  const onJoinedGroupDeleted = useCallback(group => {
+    // console.log('[Listener] OnJoinedGroupDeleted', {
+    //   groupID: group.groupID,
+    //   groupName: group.groupName,
+    // });
+    removeGroupConversation(group.groupID, group.groupName, 'left');
+  }, [removeGroupConversation]);
+  const onGroupDismissed = useCallback(group => {
+    // console.log('[Listener] OnGroupDismissed', {
+    //   groupID: group.groupID,
+    //   groupName: group.groupName,
+    // });
+    removeGroupConversation(group.groupID, group.groupName, 'dismissed');
+  }, [removeGroupConversation]);
   const OnGroupMemberInfoChanged = useCallback(member => {
+    // console.log('[Listener] OnGroupMemberInfoChanged', {
+    //   userID: member.userID,
+    //   groupID: member.groupID,
+    //   permissions: member.permissions,
+    //   roleLevel: member.roleLevel,
+    // });
     const conversation = useConversationStore.getState().getCurrentConversation();
     if (member?.groupID === conversation?.groupID && member?.userID === currentUserId) {
       DeviceEventEmitter.emit(ChatEvent.GroupPermissionUpdated, {
@@ -98,7 +192,7 @@ export const useChatListener = () => {
     syncPinnedMessagesOnEvent(messagePinned.conversationID);
   }, [updateOneMessage]);
   const onRecvNewMessages = useCallback(messages => {
-    console.log('[Listener] OnRecvNewMessages', messages);
+    // console.log('[Listener] OnRecvNewMessages', messages);
     const conversationId = useConversationStore.getState().currentConversationId;
     const targetUserId = useConversationStore.getState().currentUserId;
     if (!conversationId && !targetUserId) return;
@@ -106,8 +200,8 @@ export const useChatListener = () => {
     if (!relevant.length) return;
     relevant.forEach(msg => useMessageStore.getState().pushNewMessage(msg));
   }, []);
-  const onRecvOfflineNewMessages = useCallback(messages => {
-    console.log('[Listener] onRecvOfflineNewMessages', messages);
+  const onRecvOfflineNewMessages = useCallback(_messages => {
+    // console.log('[Listener] onRecvOfflineNewMessages', _messages);
   }, []);
   useEffect(() => {
     // Conversation
@@ -115,9 +209,12 @@ export const useChatListener = () => {
     OpenIMSDK.on(OpenIMEvent.OnNewConversation, onNewConversation);
     // Group members
+    OpenIMSDK.on(OpenIMEvent.OnGroupInfoChanged, onGroupInfoChanged);
     OpenIMSDK.on(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
     OpenIMSDK.on(OpenIMEvent.OnGroupMemberDeleted, onGroupMemberDeleted);
     OpenIMSDK.on(OpenIMEvent.OnGroupMemberInfoChanged, OnGroupMemberInfoChanged);
+    OpenIMSDK.on(OpenIMEvent.OnJoinedGroupDeleted, onJoinedGroupDeleted);
+    OpenIMSDK.on(OpenIMEvent.OnGroupDismissed, onGroupDismissed);
     // Message status
     OpenIMSDK.on(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
@@ -131,9 +228,12 @@ export const useChatListener = () => {
       OpenIMSDK.off(OpenIMEvent.OnNewConversation, onNewConversation);
       // Group members
+      OpenIMSDK.off(OpenIMEvent.OnGroupInfoChanged, onGroupInfoChanged);
       OpenIMSDK.off(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
       OpenIMSDK.off(OpenIMEvent.OnGroupMemberDeleted, onGroupMemberDeleted);
-      OpenIMSDK.on(OpenIMEvent.OnGroupMemberInfoChanged, OnGroupMemberInfoChanged);
+      OpenIMSDK.off(OpenIMEvent.OnGroupMemberInfoChanged, OnGroupMemberInfoChanged);
+      OpenIMSDK.off(OpenIMEvent.OnJoinedGroupDeleted, onJoinedGroupDeleted);
+      OpenIMSDK.off(OpenIMEvent.OnGroupDismissed, onGroupDismissed);
       // Message status
       OpenIMSDK.off(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
@@ -142,6 +242,6 @@ export const useChatListener = () => {
       OpenIMSDK.off(OpenIMEvent.OnRecvMessagePinned, onMessagePinned);
       OpenIMSDK.off(OpenIMEvent.OnRecvOfflineNewMessages, onRecvOfflineNewMessages);
     };
-  }, [onConversationChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessagePinned, onMessageRevoked, onNewConversation, onSendMessageProgress, onRecvNewMessages, onRecvOfflineNewMessages, OnGroupMemberInfoChanged]);
+  }, [onConversationChanged, onGroupInfoChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessagePinned, onMessageRevoked, onNewConversation, onSendMessageProgress, onRecvNewMessages, onRecvOfflineNewMessages, OnGroupMemberInfoChanged, onJoinedGroupDeleted, onGroupDismissed]);
 };
 //# sourceMappingURL=useChatListener.js.map

package/lib/module/core/useChatListener.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","belongsToConversation","DeviceEventEmitter","ChatEvent","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","oldMap","getState","map","visibleConversations","conversation","latestMsg","JSON","parse","isInternal","push","recvMsgOpt","NotNotify","conversationID","latestMsgSendTime","lastMessageText","hideSenderPrefixForDirectChat","show","key","title","showName","body","avatarUrl","faceURL","ellipsizeMiddle","contentType","FileMessage","onPress","hide","updateConversations","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","OnGroupMemberInfoChanged","getCurrentConversation","emit","GroupPermissionUpdated","permissions","onMessageRevoked","revokedInfo","onMessagePinned","messagePinned","currentConversationId","isPinned","pinnedByUserID","operatorUserID","undefined","pinnedTime","onRecvNewMessages","messages","conversationId","targetUserId","relevant","filter","length","forEach","msg","pushNewMessage","onRecvOfflineNewMessages","on","OnConversationChanged","OnNewConversation","OnGroupMemberAdded","OnGroupMemberDeleted","SendMessageProgress","OnNewRecvMessageRevoked","OnRecvMessagePinned","OnRecvNewMessages","OnRecvOfflineNewMessages","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","SessionType","useQueryClient","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","belongsToConversation","getConversationID","DeviceEventEmitter","ChatEvent","conversationQueryKeys","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","queryClient","onSendMessageProgress","progress","_progress","message","onConversationChanged","conversations","oldMap","getState","map","visibleConversations","conversation","latestMsg","JSON","parse","isInternal","push","recvMsgOpt","NotNotify","conversationID","latestMsgSendTime","lastMessageText","hideSenderPrefixForDirectChat","show","key","title","showName","body","avatarUrl","faceURL","ellipsizeMiddle","contentType","FileMessage","onPress","hide","updateConversations","onNewConversation","onGroupInfoChanged","group","setQueryData","groupInfo","groupID","onGroupMemberAdded","member","invalidateQueries","queryKey","restoreGroupConversation","removeGroupConversation","groupName","reason","REMOVE_FLOW_ENABLED","Group","isCurrentConversation","currentConversationId","removeQueries","emit","GroupRemoved","onGroupMemberDeleted","undefined","onJoinedGroupDeleted","onGroupDismissed","OnGroupMemberInfoChanged","getCurrentConversation","GroupPermissionUpdated","permissions","onMessageRevoked","revokedInfo","clientMsgID","onMessagePinned","messagePinned","isPinned","pinnedByUserID","operatorUserID","pinnedTime","onRecvNewMessages","messages","conversationId","targetUserId","relevant","filter","length","forEach","msg","pushNewMessage","onRecvOfflineNewMessages","_messages","on","OnConversationChanged","OnNewConversation","OnGroupInfoChanged","OnGroupMemberAdded","OnGroupMemberDeleted","OnJoinedGroupDeleted","OnGroupDismissed","SendMessageProgress","OnNewRecvMessageRevoked","OnRecvMessagePinned","OnRecvNewMessages","OnRecvOfflineNewMessages","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/conversation/useGetGroupInfo.js CHANGED Viewed

@@ -14,6 +14,8 @@ export const useGetGroupInfo = (groupId = '') => useQuery({
       return null;
     }
   },
-  enabled: !!groupId
+  enabled: !!groupId,
+  staleTime: 0,
+  refetchOnMount: 'always'
 });
 //# sourceMappingURL=useGetGroupInfo.js.map

package/lib/module/hooks/conversation/useGetGroupInfo.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["useQuery","OpenIMSDK","conversationQueryKeys","useGetGroupInfo","groupId","queryKey","groupInfo","queryFn","res","getSpecifiedGroupsInfo","error","console","enabled"],"sourceRoot":"../../../../src","sources":["hooks/conversation/useGetGroupInfo.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,OAAOC,SAAS,MAAM,+BAA+B;AACrD,SAASC,qBAAqB,QAAQ,kBAAe;AAErD,OAAO,MAAMC,eAAe,GAAGA,CAACC,OAAO,GAAG,EAAE,KAC1CJ,QAAQ,CAAC;EACPK,QAAQ,EAAEH,qBAAqB,CAACI,SAAS,CAACF,OAAO,CAAC;EAClDG,OAAO,EAAE,MAAAA,CAAA,KAAY;IACnB,IAAI;MACF,MAAMC,GAAG,GAAG,MAAMP,SAAS,CAACQ,sBAAsB,CAAC,CAACL,OAAO,CAAC,CAAC;MAC7D,OAAOI,GAAG,GAAG,CAAC,CAAC;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,wBAAwB,EAAEA,KAAK,CAAC;MAC9C,OAAO,IAAI;IACb;EACF,CAAC;EACDE,OAAO,EAAE,CAAC,CAACR;~~AACb~~,CAAC,CAAC","ignoreList":[]}
1	+ {"version":3,"names":["useQuery","OpenIMSDK","conversationQueryKeys","useGetGroupInfo","groupId","queryKey","groupInfo","queryFn","res","getSpecifiedGroupsInfo","error","console","enabled","staleTime","refetchOnMount"],"sourceRoot":"../../../../src","sources":["hooks/conversation/useGetGroupInfo.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,OAAOC,SAAS,MAAM,+BAA+B;AACrD,SAASC,qBAAqB,QAAQ,kBAAe;AAErD,OAAO,MAAMC,eAAe,GAAGA,CAACC,OAAO,GAAG,EAAE,KAC1CJ,QAAQ,CAAC;EACPK,QAAQ,EAAEH,qBAAqB,CAACI,SAAS,CAACF,OAAO,CAAC;EAClDG,OAAO,EAAE,MAAAA,CAAA,KAAY;IACnB,IAAI;MACF,MAAMC,GAAG,GAAG,MAAMP,SAAS,CAACQ,sBAAsB,CAAC,CAACL,OAAO,CAAC,CAAC;MAC7D,OAAOI,GAAG,GAAG,CAAC,CAAC;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,wBAAwB,EAAEA,KAAK,CAAC;MAC9C,OAAO,IAAI;IACb;EACF,CAAC;EACDE,OAAO,EAAE,CAAC,CAACR,OAAO;EAClBS,SAAS,EAAE,CAAC;EACZC,cAAc,EAAE;AAClB,CAAC,CAAC","ignoreList":[]}

package/lib/module/hooks/message/usePinMessage.js CHANGED Viewed

@@ -1,13 +1,14 @@
 "use strict";
 import { useCallback, useEffect } from 'react';
-import OpenIMSDK from '@droppii/openim-rn-client-sdk';
+import OpenIMSDK, { GroupPermission } from '@droppii/openim-rn-client-sdk';
 import { useConversationStore } from "../../store/conversation.js";
 import { useMessageStore } from "../../store/message.js";
 import { usePinnedMessageStore } from "../../store/pinnedMessage.js";
 import { useUserStore } from "../../store/user.js";
 import { UIUtils } from "../../utils/UIUtils.js";
 import { trans } from "../../translation/index.js";
+import { useGuardedAction } from "../useGroupPermission.js";
 const PINNED_MESSAGES_PAGE_SIZE = 5;
 export const fetchPinnedMessages = async conversationID => {
   try {
@@ -125,9 +126,10 @@ export const usePinMessage = conversationID => {
       });
     }
   }, [conversationID, removeMessage]);
+  const pinMessageWithPermission = useGuardedAction(GroupPermission.PinMessage, pinMessage);
   return {
     pinnedMessages,
-    pinMessage,
+    pinMessage: pinMessageWithPermission,
     unpinMessage
   };
 };

package/lib/module/hooks/message/usePinMessage.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["useCallback","useEffect","OpenIMSDK","useConversationStore","useMessageStore","usePinnedMessageStore","useUserStore","UIUtils","trans","PINNED_MESSAGES_PAGE_SIZE","fetchPinnedMessages","conversationID","result","getPinnedMessageList","offset","pageSize","previouslyPinnedIds","Set","getState","messages","map","msg","clientMsgID","pinnedIds","messageList","setMessages","totalCount","remainingPinCount","updateOneMessage","forEach","isPinned","has","error","console","showPinLimitReachedModal","maxCount","alert","open","title","message","primaryIndex","buttons","label","kind","onPress","usePinMessage","pinnedMessages","state","addMessage","removeMessage","reset","catch","pinMessage","pinMsg","pinnedByUserID","user","userID","pinnedTime","Date","now","toast","theme","unpinMessage","unpinMsg","undefined","syncPinnedMessagesOnEvent","currentConversationId"],"sourceRoot":"../../../../src","sources":["hooks/message/usePinMessage.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,SAAS,QAAQ,OAAO;AAC9C,OAAOC,SAAS,~~MAAM~~,+BAA+B;~~AAErD~~,SAASC,oBAAoB,QAAQ,6BAA0B;AAC/D,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,qBAAqB,QAAQ,8BAA2B;AACjE,SAASC,YAAY,QAAQ,qBAAkB;AAC/C,SAASC,OAAO,QAAQ,wBAAqB;AAC7C,SAASC,KAAK,QAAQ,4BAAmB;~~AAEzC~~,MAAMC,yBAAyB,GAAG,CAAC;AAEnC,OAAO,MAAMC,mBAAmB,GAAG,MAAOC,cAAsB,IAAK;EACnE,IAAI;IACF,MAAMC,MAAM,GAAG,~~MAAMV~~,SAAS,~~CAACW~~,oBAAoB,CAAC;MAClDF,cAAc;MACdG,MAAM,EAAE,CAAC;MACTC,QAAQ,EAAEN;IACZ,CAAC,CAAC;IAEF,MAAMO,mBAAmB,GAAG,IAAIC,GAAG,~~CACjCZ~~,qBAAqB,~~CAACa~~,QAAQ,CAAC,CAAC,CAACC,QAAQ,CAACC,GAAG,CAAEC,GAAG,IAAKA,GAAG,CAACC,WAAW,CACxE,CAAC;IACD,MAAMC,SAAS,GAAG,IAAIN,GAAG,CAACL,MAAM,CAACY,WAAW,CAACJ,GAAG,CAAEC,GAAG,IAAKA,GAAG,CAACC,WAAW,CAAC,CAAC;~~IAE3EjB~~,qBAAqB,~~CAClBa~~,QAAQ,CAAC,CAAC,CACVO,WAAW,CACVb,MAAM,CAACY,WAAW,EAClBZ,MAAM,CAACc,UAAU,EACjBd,MAAM,CAACe,iBACT,CAAC;;IAEH;IACA;IACA;IACA;IACA,MAAM;MAAEC;IAAiB,CAAC,~~GAAGxB~~,eAAe,~~CAACc~~,QAAQ,CAAC,CAAC;IACvDK,SAAS,CAACM,OAAO,CAAEP,WAAW,IAAK;MACjCM,gBAAgB,CAAC;QAAEN,WAAW;QAAEQ,QAAQ,EAAE;MAAK,CAAC,CAAC;IACnD,CAAC,CAAC;IACFd,mBAAmB,CAACa,OAAO,CAAEP,WAAW,IAAK;MAC3C,IAAI,CAACC,SAAS,CAACQ,GAAG,CAACT,WAAW,CAAC,EAAE;QAC/BM,gBAAgB,CAAC;UAAEN,WAAW;UAAEQ,QAAQ,EAAE;QAAM,CAAC,CAAC;MACpD;IACF,CAAC,CAAC;EACJ,CAAC,CAAC,OAAOE,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,qBAAqB,EAAEA,KAAK,CAAC;EAC7C;AACF,CAAC;AAED,MAAME,wBAAwB,GAAIC,QAAgB,IAAK;~~EACrD5B~~,OAAO,~~CAAC6B~~,KAAK,CAACC,IAAI,CAAC;IACjBC,KAAK,~~EAAE9B~~,KAAK,CAAC,sBAAsB,CAAC;~~IACpC+B~~,OAAO,~~EAAE/B~~,KAAK,CAAC,qBAAqB,EAAE;~~MAAE2B~~;IAAS,CAAC,CAAC;IACnDK,YAAY,EAAE,CAAC;IACfC,OAAO,EAAE,CACP;MACEC,KAAK,~~EAAElC~~,KAAK,CAAC,wBAAwB,CAAC;~~MACtCmC~~,IAAI,EAAE,SAAS;MACfC,OAAO,EAAEA,CAAA,KAAM,CAAC;IAClB,CAAC;EAEL,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMC,aAAa,GAAIlC,cAAuB,IAAK;EACxD,MAAMmC,cAAc,~~GAAGzC~~,qBAAqB,~~CAAE0C~~,KAAK,IAAKA,KAAK,CAAC5B,QAAQ,CAAC;EACvE,MAAMO,UAAU,~~GAAGrB~~,qBAAqB,~~CAAE0C~~,KAAK,IAAKA,KAAK,CAACrB,UAAU,CAAC;EACrE,MAAMC,iBAAiB,~~GAAGtB~~,qBAAqB,~~CAC5C0C~~,KAAK,IAAKA,KAAK,CAACpB,iBACnB,CAAC;EACD,MAAMqB,UAAU,~~GAAG3C~~,qBAAqB,~~CAAE0C~~,KAAK,IAAKA,KAAK,CAACC,UAAU,CAAC;EACrE,MAAMC,aAAa,~~GAAG5C~~,qBAAqB,~~CAAE0C~~,KAAK,IAAKA,KAAK,CAACE,aAAa,CAAC;EAC3E,MAAMC,KAAK,~~GAAG7C~~,qBAAqB,~~CAAE0C~~,KAAK,IAAKA,KAAK,CAACG,KAAK,CAAC;~~EAE3DjD~~,SAAS,CAAC,MAAM;IACd,IAAI,~~CAACU~~,cAAc,EAAE;IAErBD,mBAAmB,CAACC,cAAc,CAAC,CAACwC,KAAK,CAAEnB,KAAK,IAAK;MACnDC,OAAO,CAACD,KAAK,CAAC,qBAAqB,EAAEA,KAAK,CAAC;IAC7C,CAAC,CAAC;IAEF,OAAO,MAAM;MACXkB,KAAK,CAAC,CAAC;IACT,CAAC;EACH,CAAC,EAAE,CAACvC,cAAc,EAAEuC,KAAK,CAAC,CAAC;EAE3B,MAAME,UAAU,~~GAAGpD~~,WAAW,CAC5B,~~MAAOuC~~,OAAoB,IAAK;IAC9B,IAAI,CAAC5B,cAAc,EAAE;IAErB,IAAIgB,iBAAiB,IAAI,CAAC,EAAE;MAC1BO,wBAAwB,CAACR,UAAU,GAAGC,iBAAiB,CAAC;MACxD;IACF;IAEA,IAAI;MACF,~~MAAMzB~~,SAAS,~~CAACmD~~,MAAM,CAAC1C,cAAc,EAAE4B,OAAO,CAACjB,WAAW,CAAC;MAC3D0B,UAAU,CAACT,OAAO,CAAC;~~MACnBnC~~,eAAe,~~CAACc~~,QAAQ,CAAC,CAAC,CAACU,gBAAgB,CAAC;QAC1CN,WAAW,EAAEiB,OAAO,CAACjB,WAAW;QAChCQ,QAAQ,EAAE,IAAI;QACdwB,cAAc,~~EAAEhD~~,YAAY,~~CAACY~~,QAAQ,CAAC,CAAC,CAACqC,IAAI,EAAEC,MAAM;QACpDC,UAAU,EAAEC,IAAI,CAACC,GAAG,CAAC;MACvB,CAAC,CAAC;~~MACFpD~~,OAAO,~~CAACqD~~,KAAK,CAACvB,IAAI,CAAC;QACjBC,KAAK,~~EAAE9B~~,KAAK,CAAC,0BAA0B,CAAC;~~QACxCqD~~,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC,OAAO7B,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,YAAY,EAAEA,KAAK,CAAC;~~MAClCzB~~,OAAO,~~CAACqD~~,KAAK,CAACvB,IAAI,CAAC;QACjBC,KAAK,~~EAAE9B~~,KAAK,CAAC,oBAAoB,CAAC;~~QAClCqD~~,KAAK,EAAE;MACT,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CAAClD,cAAc,EAAEgB,iBAAiB,EAAED,UAAU,EAAEsB,UAAU,CAC5D,CAAC;EAED,MAAMc,YAAY,~~GAAG9D~~,WAAW,CAC9B,~~MAAOuC~~,OAAoB,IAAK;IAC9B,IAAI,CAAC5B,cAAc,EAAE;IAErB,IAAI;MACF,~~MAAMT~~,SAAS,~~CAAC6D~~,QAAQ,CAACpD,cAAc,EAAE4B,OAAO,CAACjB,WAAW,CAAC;MAC7D2B,aAAa,CAACV,OAAO,CAACjB,WAAW,CAAC;~~MAClClB~~,eAAe,~~CAACc~~,QAAQ,CAAC,CAAC,CAACU,gBAAgB,CAAC;QAC1CN,WAAW,EAAEiB,OAAO,CAACjB,WAAW;QAChCQ,QAAQ,EAAE,KAAK;QACfwB,cAAc,EAAEU,SAAS;QACzBP,UAAU,EAAEO;MACd,CAAC,CAAC;~~MACFzD~~,OAAO,~~CAACqD~~,KAAK,CAACvB,IAAI,CAAC;QACjBC,KAAK,~~EAAE9B~~,KAAK,CAAC,4BAA4B,CAAC;~~QAC1CqD~~,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC,OAAO7B,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,cAAc,EAAEA,KAAK,CAAC;~~MACpCzB~~,OAAO,~~CAACqD~~,KAAK,CAACvB,IAAI,CAAC;QACjBC,KAAK,~~EAAE9B~~,KAAK,CAAC,oBAAoB,CAAC;~~QAClCqD~~,KAAK,EAAE;MACT,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CAAClD,cAAc,EAAEsC,aAAa,CAChC,CAAC;EAED,OAAO;~~IACLH~~,cAAc;IACdM,UAAU;~~IACVU~~;EACF,CAAC;AACH,CAAC;AAED,OAAO,~~MAAMG~~,yBAAyB,~~GAAItD~~,cAAsB,IAAK;EACnE,~~MAAMuD~~,qBAAqB,~~GACzB/D~~,oBAAoB,~~CAACe~~,QAAQ,CAAC,CAAC,~~CAACgD~~,qBAAqB;EACvD,~~IAAIvD~~,cAAc,~~KAAKuD~~,qBAAqB,EAAE;~~EAE9CxD~~,mBAAmB,CAACC,cAAc,CAAC,CAACwC,KAAK,CAAEnB,KAAK,IAAK;IACnDC,OAAO,CAACD,KAAK,CAAC,2BAA2B,EAAEA,KAAK,CAAC;EACnD,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
1	+ {"version":3,"names":["useCallback","useEffect","OpenIMSDK","GroupPermission","useConversationStore","useMessageStore","usePinnedMessageStore","useUserStore","UIUtils","trans","useGuardedAction","PINNED_MESSAGES_PAGE_SIZE","fetchPinnedMessages","conversationID","result","getPinnedMessageList","offset","pageSize","previouslyPinnedIds","Set","getState","messages","map","msg","clientMsgID","pinnedIds","messageList","setMessages","totalCount","remainingPinCount","updateOneMessage","forEach","isPinned","has","error","console","showPinLimitReachedModal","maxCount","alert","open","title","message","primaryIndex","buttons","label","kind","onPress","usePinMessage","pinnedMessages","state","addMessage","removeMessage","reset","catch","pinMessage","pinMsg","pinnedByUserID","user","userID","pinnedTime","Date","now","toast","theme","unpinMessage","unpinMsg","undefined","pinMessageWithPermission","PinMessage","syncPinnedMessagesOnEvent","currentConversationId"],"sourceRoot":"../../../../src","sources":["hooks/message/usePinMessage.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/message/useSendMessage.js CHANGED Viewed

@@ -16,8 +16,8 @@ import { ChatEvent } from "../../types/events.js";
 import { useQueryClient } from '@tanstack/react-query';
 import { stickerQueryKeys } from "../query-keys.js";
 import { getMessagePreview } from "../../utils/messageUtils.js";
-import { UIUtils } from "../../utils/UIUtils.js";
 import { trans } from "../../translation/index.js";
+import { useGuardedAction } from "../useGroupPermission.js";
 const buildSendParams = (message, recvID, groupID, extendMessageInfo) => ({
   groupID,
   recvID,
@@ -33,8 +33,7 @@ export const useSendMessage = () => {
   const updateOneMessage = useMessageStore(state => state.updateOneMessage);
   const {
     quotedMessage,
-    setQuotedMessage,
-    groupPermissions
+    setQuotedMessage
   } = useChatDetailContext();
   const queryClient = useQueryClient();
   const dispatchSend = useCallback(async (message, recvID, groupID, extendMessageInfo) => {
@@ -69,13 +68,6 @@ export const useSendMessage = () => {
     const recvID = currentConversation?.userID || targetUserId;
     const groupID = currentConversation?.groupID || targetGroupId;
     if (!recvID && !groupID) return;
-    if (currentConversation?.conversationType === SessionType.Group && !groupPermissions?.includes(GroupPermission.SendMessage)) {
-      UIUtils.toast.open({
-        title: trans('chat:no_send_permission'),
-        theme: 'info'
-      });
-      return;
-    }
     const messageList = [];
     const hasText = !!plainText && plainText.trim() !== '';
     const hasPreview = !!urlMetadata?.url;
@@ -132,7 +124,7 @@ export const useSendMessage = () => {
         queryKey: stickerQueryKeys.recent()
       });
     }
-  }, [applicationType, dispatchSend, quotedMessage, setQuotedMessage, queryClient, groupPermissions]);
+  }, [applicationType, dispatchSend, quotedMessage, setQuotedMessage, queryClient]);
   const retryMessage = useCallback(async message => {
     const {
       userID: recvID,
@@ -174,22 +166,28 @@ export const useSendMessage = () => {
     });
     markMessageRevoked(message.clientMsgID);
   }, []);
+  const sendMessageWithPermission = useGuardedAction(GroupPermission.SendMessage, sendMessage, {
+    deniedMessage: trans('chat:no_send_permission')
+  });
   return {
-    sendMessage,
+    sendMessage: sendMessageWithPermission,
     retryMessage,
     revokeMessage
   };
 };
 export const generateOfflinePushInfo = message => {
   const conversationData = useConversationStore?.getState?.()?.getCurrentConversation();
-  const operatorUserID = useUserStore.getState().user?.userID || '';
-  const title = conversationData?.showName || 'Droppii';
+  const operator = useUserStore.getState().user;
+  const operatorUserID = operator?.userID || '';
+  const isSingleChat = conversationData?.conversationType === SessionType.Single;
+  const title = isSingleChat ? operator?.nickname || 'Droppii' : conversationData?.showName || 'Droppii';
+  const icon = isSingleChat ? operator?.faceURL || '' : conversationData?.faceURL || '';
   const desc = getMessagePreview(message);
   return {
     title,
     desc,
     ex: JSON.stringify({
-      icon: conversationData?.faceURL || '',
+      icon,
       conversationId: conversationData?.conversationID || '',
       userId: operatorUserID,
       groupId: conversationData?.groupID || '',

package/lib/module/hooks/message/useSendMessage.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"names":["useCallback","useConversationStore","useUserStore","GroupPermission","MessageStatus","MessageType","SessionType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","getBotId","markMessageRevoked","useMessageStore","uuid","DeviceEventEmitter","ChatEvent","useQueryClient","stickerQueryKeys","getMessagePreview","UIUtils","trans","buildSendParams","message","recvID","groupID","extendMessageInfo","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","quotedMessage","setQuotedMessage","groupPermissions","queryClient","dispatchSend","status","Sending","sendParams","sent","sendMessage","Failed","Promise","resolve","setTimeout","emit","ScrollToBottom","plainText","urlMetadata","flow","customMessage","sticker","currentConversation","getState","getCurrentConversation","targetUserId","currentUserId","targetGroupId","currentGroupId","userID","conversationType","Group","includes","SendMessage","toast","open","title","theme","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","createQuotedMessage","text","undefined","createUrlTextMessage","createTextMessage","push","customElem","data","extension","type","description","Order","orderCode","createCustomMessage","file","fullUrl","stickerMessage","createStickerMessage","stickerId","id","invalidateQueries","queryKey","recent","retryMessage","isAttachment","PictureMessage","VideoMessage","FileMessage","MergeMessage","contentType","params","sendMessageNotOss","parse","revokeMessage","conversationID","Error","clientMsgID","conversationData","operatorUserID","user","showName","desc","icon","faceURL","conversationId","userId","groupId","botId","iOSPushSound","iOSBadgeCount","textMessage","v4","then","catch","errCode","errMsg","console","error","urlTextMessage","createQuoteMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"names":["useCallback","useConversationStore","useUserStore","GroupPermission","MessageStatus","MessageType","SessionType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","getBotId","markMessageRevoked","useMessageStore","uuid","DeviceEventEmitter","ChatEvent","useQueryClient","stickerQueryKeys","getMessagePreview","trans","useGuardedAction","buildSendParams","message","recvID","groupID","extendMessageInfo","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","quotedMessage","setQuotedMessage","queryClient","dispatchSend","status","Sending","sendParams","sent","sendMessage","Failed","Promise","resolve","setTimeout","emit","ScrollToBottom","plainText","urlMetadata","flow","customMessage","sticker","currentConversation","getState","getCurrentConversation","targetUserId","currentUserId","targetGroupId","currentGroupId","userID","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","createQuotedMessage","text","undefined","createUrlTextMessage","createTextMessage","push","customElem","data","extension","type","description","Order","orderCode","createCustomMessage","file","fullUrl","stickerMessage","createStickerMessage","stickerId","id","invalidateQueries","queryKey","recent","retryMessage","isAttachment","PictureMessage","VideoMessage","FileMessage","MergeMessage","includes","contentType","params","sendMessageNotOss","parse","revokeMessage","conversationID","Error","clientMsgID","sendMessageWithPermission","SendMessage","deniedMessage","conversationData","operator","user","operatorUserID","isSingleChat","conversationType","Single","title","nickname","showName","icon","faceURL","desc","conversationId","userId","groupId","botId","iOSPushSound","iOSBadgeCount","textMessage","v4","then","catch","errCode","errMsg","console","error","urlTextMessage","createQuoteMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useConversationList.js CHANGED Viewed

@@ -16,13 +16,18 @@ export function useConversationList({
     enabled: enabled !== false,
     queryFn: async () => {
       const offset = (page - 1) * 500;
-      const conversations = await OpenIMSDK.getConversationListSplitApp({
+      const [conversations, joinedGroups] = await Promise.all([OpenIMSDK.getConversationListSplitApp({
         offset,
         count: 500,
         applicationType
-      });
-      useConversationStore.getState().updateConversations(conversations);
-      return conversations;
+      }), OpenIMSDK.getJoinedGroupList()]);
+      const joinedGroupIds = new Set(joinedGroups.map(g => g.groupID));
+      const resolved = conversations.map(conversation => conversation.groupID && !joinedGroupIds.has(conversation.groupID) ? {
+        ...conversation,
+        isNotInGroup: true
+      } : conversation);
+      useConversationStore.getState().updateConversations(resolved);
+      return resolved;
     }
   });