@droppii-org/chat-mobile 0.2.47 → 0.2.48
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.
- package/lib/module/config/api-endpoints.js +1 -1
- package/lib/module/config/api-endpoints.js.map +1 -1
- package/lib/module/core/useChatListener.js +3 -2
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/hooks/message/useSendMessage.js +5 -4
- package/lib/module/hooks/message/useSendMessage.js.map +1 -1
- package/lib/module/hooks/query-keys.js +6 -1
- package/lib/module/hooks/query-keys.js.map +1 -1
- package/lib/module/hooks/useChatCompose.js +18 -1
- package/lib/module/hooks/useChatCompose.js.map +1 -1
- package/lib/module/hooks/users/useGetUsersInfo.js +14 -0
- package/lib/module/hooks/users/useGetUsersInfo.js.map +1 -0
- package/lib/module/screens/chat-detail/ChatDetail.js +4 -5
- package/lib/module/screens/chat-detail/ChatDetail.js.map +1 -1
- package/lib/module/screens/chat-detail/ChatDetailHeader.js +21 -4
- package/lib/module/screens/chat-detail/ChatDetailHeader.js.map +1 -1
- package/lib/module/screens/inbox/Inbox.js +3 -3
- package/lib/module/screens/inbox/Inbox.js.map +1 -1
- package/lib/module/services/endpoints.js +6 -5
- package/lib/module/services/endpoints.js.map +1 -1
- package/lib/module/store/conversation.js +24 -3
- package/lib/module/store/conversation.js.map +1 -1
- package/lib/module/utils/message.js +2 -2
- package/lib/module/utils/message.js.map +1 -1
- package/lib/typescript/src/config/api-endpoints.d.ts +1 -1
- package/lib/typescript/src/config/api-endpoints.d.ts.map +1 -1
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts.map +1 -1
- package/lib/typescript/src/hooks/query-keys.d.ts +5 -0
- package/lib/typescript/src/hooks/query-keys.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useChatCompose.d.ts.map +1 -1
- package/lib/typescript/src/hooks/users/useGetUsersInfo.d.ts +2 -0
- package/lib/typescript/src/hooks/users/useGetUsersInfo.d.ts.map +1 -0
- package/lib/typescript/src/screens/chat-detail/ChatDetail.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatDetailHeader.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatDetailHeader.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/types.d.ts +1 -0
- package/lib/typescript/src/screens/chat-detail/types.d.ts.map +1 -1
- package/lib/typescript/src/screens/inbox/Inbox.d.ts +2 -2
- package/lib/typescript/src/screens/inbox/Inbox.d.ts.map +1 -1
- package/lib/typescript/src/services/endpoints.d.ts +1 -0
- package/lib/typescript/src/services/endpoints.d.ts.map +1 -1
- package/lib/typescript/src/store/conversation.d.ts +6 -1
- package/lib/typescript/src/store/conversation.d.ts.map +1 -1
- package/lib/typescript/src/types/chat.d.ts +19 -0
- package/lib/typescript/src/types/chat.d.ts.map +1 -1
- package/lib/typescript/src/utils/message.d.ts +1 -1
- package/lib/typescript/src/utils/message.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/config/api-endpoints.ts +2 -2
- package/src/core/useChatListener.ts +3 -2
- package/src/hooks/message/useSendMessage.ts +8 -2
- package/src/hooks/query-keys.ts +6 -0
- package/src/hooks/useChatCompose.ts +19 -0
- package/src/hooks/users/useGetUsersInfo.ts +13 -0
- package/src/screens/chat-detail/ChatDetail.tsx +8 -5
- package/src/screens/chat-detail/ChatDetailHeader.tsx +20 -4
- package/src/screens/chat-detail/types.ts +1 -0
- package/src/screens/inbox/Inbox.tsx +9 -4
- package/src/services/endpoints.ts +5 -5
- package/src/store/conversation.ts +37 -3
- package/src/types/chat.ts +21 -0
- package/src/utils/message.ts +7 -2
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
|
|
14
14
|
const DEFAULT_ENDPOINTS = {
|
|
15
15
|
urlMetadata: '/chat-service/v1/utils/url-metadata',
|
|
16
|
-
|
|
16
|
+
conversation: '/chat-service/v1/app/conversations',
|
|
17
17
|
imageUpload: '/uploader-service/v1/uploader/permanently',
|
|
18
18
|
bot: '/chat-service/v1/app/bots/'
|
|
19
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DEFAULT_ENDPOINTS","urlMetadata","
|
|
1
|
+
{"version":3,"names":["DEFAULT_ENDPOINTS","urlMetadata","conversation","imageUpload","bot","endpoints","getApiEndpoint","key","setApiEndpoint","value","setAllApiEndpoints","newEndpoints","resetApiEndpoints","getAllApiEndpoints"],"sourceRoot":"../../../src","sources":["config/api-endpoints.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAWA,MAAMA,iBAA+B,GAAG;EACtCC,WAAW,EAAE,qCAAqC;EAClDC,YAAY,EAAE,oCAAoC;EAClDC,WAAW,EAAE,2CAA2C;EACxDC,GAAG,EAAE;AACP,CAAC;AAED,IAAIC,SAAuB,GAAG;EAAE,GAAGL;AAAkB,CAAC;;AAEtD;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMM,cAAc,GACzBC,GAAM,IACc;EACpB,OAAOF,SAAS,CAACE,GAAG,CAAC;AACvB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAGA,CAC5BD,GAAM,EACNE,KAAsB,KACnB;EACHJ,SAAS,CAACE,GAAG,CAAC,GAAGE,KAAK;AACxB,CAAC;;AAED;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAIC,YAAmC,IAAK;EACzEN,SAAS,GAAG;IACV,GAAGA,SAAS;IACZ,GAAGM;EACL,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAGA,CAAA,KAAM;EACrCP,SAAS,GAAG;IAAE,GAAGL;EAAkB,CAAC;AACtC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMa,kBAAkB,GAAGA,CAAA,MAAqB;EACrD,GAAGR;AACL,CAAC,CAAC","ignoreList":[]}
|
|
@@ -85,8 +85,9 @@ export const useChatListener = () => {
|
|
|
85
85
|
const onRecvNewMessages = useCallback(messages => {
|
|
86
86
|
console.log('[Listener] OnRecvNewMessages', messages);
|
|
87
87
|
const conversationId = useConversationStore.getState().currentConversationId;
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
const targetUserId = useConversationStore.getState().currentUserId;
|
|
89
|
+
if (!conversationId && !targetUserId) return;
|
|
90
|
+
const relevant = messages.filter(message => belongsToConversation(message, conversationId, targetUserId));
|
|
90
91
|
if (!relevant.length) return;
|
|
91
92
|
relevant.forEach(msg => useMessageStore.getState().pushNewMessage(msg));
|
|
92
93
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","belongsToConversation","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","oldMap","getState","map","conversation","oldConversation","conversationID","recvMsgOpt","NotNotify","latestMsg","latestMsgSendTime","JSON","parse","lastMessageText","show","key","title","showName","body","ellipsizeMiddle","contentType","FileMessage","onPress","hide","updateConversations","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","onMessageRevoked","revokedInfo","onMessagePinned","messagePinned","currentConversationId","isPinned","pinnedByUserID","operatorUserID","undefined","pinnedTime","onRecvNewMessages","messages","conversationId","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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
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","belongsToConversation","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","oldMap","getState","map","conversation","oldConversation","conversationID","recvMsgOpt","NotNotify","latestMsg","latestMsgSendTime","JSON","parse","lastMessageText","show","key","title","showName","body","ellipsizeMiddle","contentType","FileMessage","onPress","hide","updateConversations","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","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":[]}
|
|
@@ -57,10 +57,11 @@ export const useSendMessage = () => {
|
|
|
57
57
|
flow,
|
|
58
58
|
customMessage
|
|
59
59
|
}) => {
|
|
60
|
-
const
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
60
|
+
const currentConversation = useConversationStore.getState().getCurrentConversation();
|
|
61
|
+
const targetUserId = useConversationStore.getState().currentUserId;
|
|
62
|
+
const targetGroupId = useConversationStore.getState().currentGroupId;
|
|
63
|
+
const recvID = currentConversation?.userID || targetUserId;
|
|
64
|
+
const groupID = currentConversation?.groupID || targetGroupId;
|
|
64
65
|
if (!recvID && !groupID) return;
|
|
65
66
|
const messageList = [];
|
|
66
67
|
const hasText = !!plainText && plainText.trim() !== '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","generateContentBasedOnMessageType","getBotId","markMessageRevoked","useMessageStore","uuid","DeviceEventEmitter","ChatEvent","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","quotedMessage","setQuotedMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","Promise","resolve","setTimeout","emit","ScrollToBottom","urlMetadata","flow","customMessage","
|
|
1
|
+
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","generateContentBasedOnMessageType","getBotId","markMessageRevoked","useMessageStore","uuid","DeviceEventEmitter","ChatEvent","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","quotedMessage","setQuotedMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","Promise","resolve","setTimeout","emit","ScrollToBottom","urlMetadata","flow","customMessage","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","retryMessage","isAttachment","PictureMessage","VideoMessage","FileMessage","MergeMessage","includes","params","sendMessageNotOss","parse","revokeMessage","conversationID","Error","conversationData","operatorUserID","user","title","showName","desc","icon","faceURL","conversationId","userId","groupId","botId","iOSPushSound","iOSBadgeCount","textMessage","v4","then","catch","errCode","errMsg","error","urlTextMessage","createQuoteMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -17,6 +17,11 @@ export const conversationQueryKeys = {
|
|
|
17
17
|
runFlow: conversationId => ['runConversationFlow', conversationId],
|
|
18
18
|
detailByBotId: botId => ['conversationByBotId', botId],
|
|
19
19
|
detailBySourceId: sourceId => ['detailBySourceId', sourceId],
|
|
20
|
-
joinedGroup: groupId => [...conversationQueryKeys.all, groupId]
|
|
20
|
+
joinedGroup: groupId => [...conversationQueryKeys.all, groupId],
|
|
21
|
+
create: userId => ['create', userId]
|
|
22
|
+
};
|
|
23
|
+
export const usersQueryKeys = {
|
|
24
|
+
all: ['users'],
|
|
25
|
+
list: userIds => [...usersQueryKeys.all, ...userIds]
|
|
21
26
|
};
|
|
22
27
|
//# sourceMappingURL=query-keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["commonQueryKeys","all","urlMetadata","url","conversationQueryKeys","lists","list","applicationType","details","detail","conversationId","getStatusBot","botId","flow","flowMainMenu","resetFlow","runFlow","detailByBotId","detailBySourceId","sourceId","joinedGroup","groupId"],"sourceRoot":"../../../src","sources":["hooks/query-keys.ts"],"mappings":";;AAAA,OAAO,MAAMA,eAAe,GAAG;EAC7BC,GAAG,EAAE,CAAC,QAAQ,CAAU;EACxBC,WAAW,EAAGC,GAAW,IAAK,CAAC,MAAM,EAAEA,GAAG;AAC5C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EACnCH,GAAG,EAAE,CAAC,eAAe,CAAU;EAC/BI,KAAK,EAAEA,CAAA,KAAM,CAAC,GAAGD,qBAAqB,CAACH,GAAG,EAAE,MAAM,CAAU;EAC5DK,IAAI,EAAGC,eAAuB,IAC5B,CAAC,GAAGH,qBAAqB,CAACC,KAAK,CAAC,CAAC,EAAEE,eAAe,CAAU;EAC9DC,OAAO,EAAEA,CAAA,KAAM,CAAC,GAAGJ,qBAAqB,CAACH,GAAG,EAAE,QAAQ,CAAU;EAChEQ,MAAM,EAAGC,cAAsB,IAC7B,CAAC,GAAGN,qBAAqB,CAACI,OAAO,CAAC,CAAC,EAAEE,cAAc,CAAU;EAC/DC,YAAY,EAAGC,KAAa,IAAK,CAAC,cAAc,EAAEA,KAAK,CAAU;EACjEC,IAAI,EAAGH,cAAsB,IAAK,CAAC,kBAAkB,EAAEA,cAAc,CAAC;EACtEI,YAAY,EAAGJ,cAAsB,IAAK,CACxC,0BAA0B,EAC1BA,cAAc,CACf;EACDK,SAAS,EAAGL,cAAsB,IAAK,CACrC,uBAAuB,EACvBA,cAAc,CACf;EACDM,OAAO,EAAGN,cAAsB,IAAK,CAAC,qBAAqB,EAAEA,cAAc,CAAC;EAC5EO,aAAa,EAAGL,KAAa,IAAK,CAAC,qBAAqB,EAAEA,KAAK,CAAC;EAChEM,gBAAgB,EAAGC,QAAgB,IAAK,CAAC,kBAAkB,EAAEA,QAAQ,CAAC;EACtEC,WAAW,EAAGC,OAAgB,IAAK,CAAC,GAAGjB,qBAAqB,CAACH,GAAG,EAAEoB,OAAO;
|
|
1
|
+
{"version":3,"names":["commonQueryKeys","all","urlMetadata","url","conversationQueryKeys","lists","list","applicationType","details","detail","conversationId","getStatusBot","botId","flow","flowMainMenu","resetFlow","runFlow","detailByBotId","detailBySourceId","sourceId","joinedGroup","groupId","create","userId","usersQueryKeys","userIds"],"sourceRoot":"../../../src","sources":["hooks/query-keys.ts"],"mappings":";;AAAA,OAAO,MAAMA,eAAe,GAAG;EAC7BC,GAAG,EAAE,CAAC,QAAQ,CAAU;EACxBC,WAAW,EAAGC,GAAW,IAAK,CAAC,MAAM,EAAEA,GAAG;AAC5C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EACnCH,GAAG,EAAE,CAAC,eAAe,CAAU;EAC/BI,KAAK,EAAEA,CAAA,KAAM,CAAC,GAAGD,qBAAqB,CAACH,GAAG,EAAE,MAAM,CAAU;EAC5DK,IAAI,EAAGC,eAAuB,IAC5B,CAAC,GAAGH,qBAAqB,CAACC,KAAK,CAAC,CAAC,EAAEE,eAAe,CAAU;EAC9DC,OAAO,EAAEA,CAAA,KAAM,CAAC,GAAGJ,qBAAqB,CAACH,GAAG,EAAE,QAAQ,CAAU;EAChEQ,MAAM,EAAGC,cAAsB,IAC7B,CAAC,GAAGN,qBAAqB,CAACI,OAAO,CAAC,CAAC,EAAEE,cAAc,CAAU;EAC/DC,YAAY,EAAGC,KAAa,IAAK,CAAC,cAAc,EAAEA,KAAK,CAAU;EACjEC,IAAI,EAAGH,cAAsB,IAAK,CAAC,kBAAkB,EAAEA,cAAc,CAAC;EACtEI,YAAY,EAAGJ,cAAsB,IAAK,CACxC,0BAA0B,EAC1BA,cAAc,CACf;EACDK,SAAS,EAAGL,cAAsB,IAAK,CACrC,uBAAuB,EACvBA,cAAc,CACf;EACDM,OAAO,EAAGN,cAAsB,IAAK,CAAC,qBAAqB,EAAEA,cAAc,CAAC;EAC5EO,aAAa,EAAGL,KAAa,IAAK,CAAC,qBAAqB,EAAEA,KAAK,CAAC;EAChEM,gBAAgB,EAAGC,QAAgB,IAAK,CAAC,kBAAkB,EAAEA,QAAQ,CAAC;EACtEC,WAAW,EAAGC,OAAgB,IAAK,CAAC,GAAGjB,qBAAqB,CAACH,GAAG,EAAEoB,OAAO,CAAC;EAC1EC,MAAM,EAAGC,MAAe,IAAK,CAAC,QAAQ,EAAEA,MAAM;AAChD,CAAC;AAED,OAAO,MAAMC,cAAc,GAAG;EAC5BvB,GAAG,EAAE,CAAC,OAAO,CAAU;EACvBK,IAAI,EAAGmB,OAAiB,IAAK,CAAC,GAAGD,cAAc,CAACvB,GAAG,EAAE,GAAGwB,OAAO;AACjE,CAAC","ignoreList":[]}
|
|
@@ -9,6 +9,9 @@ import { useSendAttachment } from "./useSendAttachment.js";
|
|
|
9
9
|
import { useSendMessage } from "./message/useSendMessage.js";
|
|
10
10
|
import { isVideoFromPicker } from "../utils/imageUtils.js";
|
|
11
11
|
import { generateAndUploadVideoThumbnails } from "../utils/videoThumbnailUpload.js";
|
|
12
|
+
import { useConversationStore } from "../store/index.js";
|
|
13
|
+
import { DChatCategory } from "../types/chat.js";
|
|
14
|
+
import { useChatContext } from "../context/index.js";
|
|
12
15
|
export function useChatCompose() {
|
|
13
16
|
const [text, setText] = useState('');
|
|
14
17
|
const imageAttachment = useImageAttachment();
|
|
@@ -20,6 +23,9 @@ export function useChatCompose() {
|
|
|
20
23
|
const {
|
|
21
24
|
sendMessage
|
|
22
25
|
} = useSendMessage();
|
|
26
|
+
const {
|
|
27
|
+
applicationType
|
|
28
|
+
} = useChatContext();
|
|
23
29
|
const isUploading = useMemo(() => imageAttachment.selectedImages.some(img => img.isUploading) || fileAttachment.selectedFiles.some(f => f.isUploading || !!f.error), [imageAttachment.selectedImages, fileAttachment.selectedFiles]);
|
|
24
30
|
const canSend = useMemo(() => (text.trim().length > 0 || imageAttachment.selectedImages.length > 0 || fileAttachment.selectedFiles.length > 0) && !isUploading, [text, imageAttachment.selectedImages, fileAttachment.selectedFiles, isUploading]);
|
|
25
31
|
const send = useCallback(async () => {
|
|
@@ -32,6 +38,17 @@ export function useChatCompose() {
|
|
|
32
38
|
clearAllFiles
|
|
33
39
|
} = fileAttachment;
|
|
34
40
|
const urlMeta = linkPreview.isVisible ? linkPreview.metadata : undefined;
|
|
41
|
+
const currentConversationId = useConversationStore.getState().currentConversationId;
|
|
42
|
+
const targetUserId = useConversationStore.getState().currentUserId;
|
|
43
|
+
const isCreatingConversation = useConversationStore.getState().isCreatingConversation;
|
|
44
|
+
if (targetUserId && !currentConversationId && !isCreatingConversation) {
|
|
45
|
+
await useConversationStore.getState().createConversation({
|
|
46
|
+
chatType: 'SINGLE',
|
|
47
|
+
chatCategory: DChatCategory.BIZ_BIZ,
|
|
48
|
+
applicationType,
|
|
49
|
+
peerUserId: targetUserId
|
|
50
|
+
});
|
|
51
|
+
}
|
|
35
52
|
|
|
36
53
|
// --- Attachments ---
|
|
37
54
|
if (selectedImages.length > 0 || selectedFiles.length > 0) {
|
|
@@ -118,7 +135,7 @@ export function useChatCompose() {
|
|
|
118
135
|
urlMetadata: urlMeta
|
|
119
136
|
});
|
|
120
137
|
}
|
|
121
|
-
}, [imageAttachment, fileAttachment, linkPreview.isVisible, linkPreview.metadata, sendAttachments, sendMessage, text]);
|
|
138
|
+
}, [imageAttachment, fileAttachment, linkPreview.isVisible, linkPreview.metadata, sendAttachments, sendMessage, text, applicationType]);
|
|
122
139
|
return {
|
|
123
140
|
// Text
|
|
124
141
|
text,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useMemo","useState","ImagePicker","useImageAttachment","useFileAttachment","useLinkPreview","useSendAttachment","useSendMessage","isVideoFromPicker","generateAndUploadVideoThumbnails","useChatCompose","text","setText","imageAttachment","fileAttachment","linkPreview","send","sendAttachments","sendMessage","isUploading","selectedImages","some","img","selectedFiles","f","error","canSend","trim","length","clearAllImages","clearAllFiles","urlMeta","isVisible","metadata","undefined","actualImages","filter","image","videos","uploadedImages","uploadedUrl","uploadedVideos","v","videosMissingThumbnail","thumbnailUrl","videoThumbnails","attachmentItems","map","type","vid","vidIdx","videoId","thumb","video","path","filename","size","width","height","duration","uploadProgress","url","thumbnailSize","clean","catch","uploadedFiles","file","uri","name","plainText","urlMetadata","isImagePreviewVisible","isFilePreviewVisible","addImages","handleImageAttach","addFiles","handleFileAttach","removeImage","handleImageRemove","removeFile","handleFileRemove","showLinkPreview","isMetadataLoading","isLoading","dismissPreview","dismiss","clearAll"],"sourceRoot":"../../../src","sources":["hooks/useChatCompose.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AACtD,OAAOC,WAAW,MAAM,gCAAgC;AACxD,SACEC,kBAAkB,QAEb,yBAAsB;AAC7B,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SAASC,cAAc,QAAQ,oCAAiC;AAChE,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SAASC,cAAc,QAAQ,6BAA0B;AACzD,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SACEC,gCAAgC,QAE3B,kCAA+B;
|
|
1
|
+
{"version":3,"names":["useCallback","useMemo","useState","ImagePicker","useImageAttachment","useFileAttachment","useLinkPreview","useSendAttachment","useSendMessage","isVideoFromPicker","generateAndUploadVideoThumbnails","useConversationStore","DChatCategory","useChatContext","useChatCompose","text","setText","imageAttachment","fileAttachment","linkPreview","send","sendAttachments","sendMessage","applicationType","isUploading","selectedImages","some","img","selectedFiles","f","error","canSend","trim","length","clearAllImages","clearAllFiles","urlMeta","isVisible","metadata","undefined","currentConversationId","getState","targetUserId","currentUserId","isCreatingConversation","createConversation","chatType","chatCategory","BIZ_BIZ","peerUserId","actualImages","filter","image","videos","uploadedImages","uploadedUrl","uploadedVideos","v","videosMissingThumbnail","thumbnailUrl","videoThumbnails","attachmentItems","map","type","vid","vidIdx","videoId","thumb","video","path","filename","size","width","height","duration","uploadProgress","url","thumbnailSize","clean","catch","uploadedFiles","file","uri","name","plainText","urlMetadata","isImagePreviewVisible","isFilePreviewVisible","addImages","handleImageAttach","addFiles","handleFileAttach","removeImage","handleImageRemove","removeFile","handleFileRemove","showLinkPreview","isMetadataLoading","isLoading","dismissPreview","dismiss","clearAll"],"sourceRoot":"../../../src","sources":["hooks/useChatCompose.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { useQuery } from '@tanstack/react-query';
|
|
4
|
+
import { usersQueryKeys } from "../query-keys.js";
|
|
5
|
+
import OpenIMSDK from '@droppii/openim-rn-client-sdk';
|
|
6
|
+
export const useGetUsersInfo = userIds => useQuery({
|
|
7
|
+
queryKey: [usersQueryKeys.list(userIds)],
|
|
8
|
+
queryFn: async () => {
|
|
9
|
+
const users = await OpenIMSDK.getUsersInfo(userIds);
|
|
10
|
+
return users || [];
|
|
11
|
+
},
|
|
12
|
+
enabled: userIds.length > 0
|
|
13
|
+
});
|
|
14
|
+
//# sourceMappingURL=useGetUsersInfo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useQuery","usersQueryKeys","OpenIMSDK","useGetUsersInfo","userIds","queryKey","list","queryFn","users","getUsersInfo","enabled","length"],"sourceRoot":"../../../../src","sources":["hooks/users/useGetUsersInfo.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,cAAc,QAAQ,kBAAe;AAC9C,OAAOC,SAAS,MAAM,+BAA+B;AAErD,OAAO,MAAMC,eAAe,GAAIC,OAAiB,IAC/CJ,QAAQ,CAAC;EACPK,QAAQ,EAAE,CAACJ,cAAc,CAACK,IAAI,CAACF,OAAO,CAAC,CAAC;EACxCG,OAAO,EAAE,MAAAA,CAAA,KAAY;IACnB,MAAMC,KAAK,GAAG,MAAMN,SAAS,CAACO,YAAY,CAACL,OAAO,CAAC;IACnD,OAAOI,KAAK,IAAI,EAAE;EACpB,CAAC;EACDE,OAAO,EAAEN,OAAO,CAACO,MAAM,GAAG;AAC5B,CAAC,CAAC","ignoreList":[]}
|
|
@@ -92,13 +92,11 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
92
92
|
unpinMessage
|
|
93
93
|
} = usePinMessage(conversationId);
|
|
94
94
|
useEffect(() => {
|
|
95
|
-
|
|
96
|
-
useConversationStore.getState().setCurrentConversation(conversationId);
|
|
97
|
-
}
|
|
95
|
+
useConversationStore.getState().setCurrentConversation(conversationId, targetUserId, targetGroupId);
|
|
98
96
|
return () => {
|
|
99
|
-
useConversationStore.getState().setCurrentConversation(undefined);
|
|
97
|
+
useConversationStore.getState().setCurrentConversation(undefined, undefined, undefined);
|
|
100
98
|
};
|
|
101
|
-
}, [conversationId]);
|
|
99
|
+
}, [conversationId, targetUserId, targetGroupId]);
|
|
102
100
|
const resolvedShowAddMember = showAddMember ?? shouldShowAddMember(conversation);
|
|
103
101
|
const insets = useSafeAreaInsets();
|
|
104
102
|
const listRef = useRef(null);
|
|
@@ -131,6 +129,7 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
131
129
|
edges: ['bottom'],
|
|
132
130
|
children: [/*#__PURE__*/_jsx(ChatDetailHeader, {
|
|
133
131
|
conversationId: conversationId,
|
|
132
|
+
targetUserId: targetUserId,
|
|
134
133
|
showAddMember: resolvedShowAddMember,
|
|
135
134
|
onBack: onBack ?? handleBackDefault,
|
|
136
135
|
onPressSearch: onPressSearch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useEffect","useMemo","useRef","DeviceEventEmitter","useKeyboardScrollToEnd","useSafeAreaInsets","KContainer","useNavigation","usePinMessage","PinnedMessageBar","openPinnedMessagesSheet","MediaViewerModal","useConversation","useConversationStore","useUserStore","ChatDetailHeader","ChatListLegend","ChatComposer","shouldShowAddMember","normalizeUrl","MessageToolboxOverlay","DBotStatusValue","useGetConversationDetail","useGetStatusConversationBot","PeerType","useMessages","getBotId","ChatEvent","jsx","_jsx","jsxs","_jsxs","ChatDetail","targetConversationId","targetUserId","targetGroupId","targetBotId","showAddMember","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","onPressUrl","customMessageItemFactory","pannelActions","navigation","mediaViewerRef","messageToolboxRef","currentUser","s","user","conversationId","isLoading","isLoadingConversation","conversation","botId","peerType","Bot","undefined","data","botInfo","status","botStatus","handleBackDefault","goBack","handleMediaPress","items","index","current","show","messages","initLoading","moreOldLoading","moreNewLoading","getMoreOldMessages","getMoreNewMessages","hasMoreOld","hasMoreNew","pinnedMessages","pinMessage","unpinMessage","getState","setCurrentConversation","resolvedShowAddMember","insets","listRef","freeze","scrollMessageToEnd","handlePressUrl","url","handleMessageLongPress","message","rect","handlePressPinnedMessageBar","currentUserId","userID","onPressMessage","emit","ScrollToMessage","clientMessageId","clientMsgID","Page","flex","edges","children","onPress","onLoadMoreOld","onLoadMoreNew","onMediaPress","onLongPress","keyboardOffset","bottom","isEmptyMessage","length","isDisableCompose","INACTIVE","ref","onPinMessage","onUnpinMessage","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetail.tsx"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useEffect","useMemo","useRef","DeviceEventEmitter","useKeyboardScrollToEnd","useSafeAreaInsets","KContainer","useNavigation","usePinMessage","PinnedMessageBar","openPinnedMessagesSheet","MediaViewerModal","useConversation","useConversationStore","useUserStore","ChatDetailHeader","ChatListLegend","ChatComposer","shouldShowAddMember","normalizeUrl","MessageToolboxOverlay","DBotStatusValue","useGetConversationDetail","useGetStatusConversationBot","PeerType","useMessages","getBotId","ChatEvent","jsx","_jsx","jsxs","_jsxs","ChatDetail","targetConversationId","targetUserId","targetGroupId","targetBotId","showAddMember","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","onPressUrl","customMessageItemFactory","pannelActions","navigation","mediaViewerRef","messageToolboxRef","currentUser","s","user","conversationId","isLoading","isLoadingConversation","conversation","botId","peerType","Bot","undefined","data","botInfo","status","botStatus","handleBackDefault","goBack","handleMediaPress","items","index","current","show","messages","initLoading","moreOldLoading","moreNewLoading","getMoreOldMessages","getMoreNewMessages","hasMoreOld","hasMoreNew","pinnedMessages","pinMessage","unpinMessage","getState","setCurrentConversation","resolvedShowAddMember","insets","listRef","freeze","scrollMessageToEnd","handlePressUrl","url","handleMessageLongPress","message","rect","handlePressPinnedMessageBar","currentUserId","userID","onPressMessage","emit","ScrollToMessage","clientMessageId","clientMsgID","Page","flex","edges","children","onPress","onLoadMoreOld","onLoadMoreNew","onMediaPress","onLongPress","keyboardOffset","bottom","isEmptyMessage","length","isDisableCompose","INACTIVE","ref","onPinMessage","onUnpinMessage","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetail.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,10 +6,12 @@ import { AvatarSection } from "../../components/ThreadCard/AvatarSection.js";
|
|
|
6
6
|
import { NamePrefixIcon } from "../../components/ThreadCard/NamePrefixIcon.js";
|
|
7
7
|
import { useConversation } from "../../store/index.js";
|
|
8
8
|
import { getConversationSubtitle } from "./conversationHeader.utils.js";
|
|
9
|
+
import { useGetUsersInfo } from "../../hooks/users/useGetUsersInfo.js";
|
|
9
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
10
11
|
const ChatDetailHeader = /*#__PURE__*/memo(({
|
|
11
12
|
showAddMember = false,
|
|
12
13
|
conversationId,
|
|
14
|
+
targetUserId,
|
|
13
15
|
onBack,
|
|
14
16
|
onPressSearch,
|
|
15
17
|
onPressAddMember,
|
|
@@ -17,6 +19,21 @@ const ChatDetailHeader = /*#__PURE__*/memo(({
|
|
|
17
19
|
onPressAvatar
|
|
18
20
|
}) => {
|
|
19
21
|
const conversation = useConversation(conversationId);
|
|
22
|
+
const {
|
|
23
|
+
data: usersInfo
|
|
24
|
+
} = useGetUsersInfo(targetUserId ? [targetUserId] : []);
|
|
25
|
+
const {
|
|
26
|
+
faceURL,
|
|
27
|
+
showName
|
|
28
|
+
} = useMemo(() => {
|
|
29
|
+
const userInfo = usersInfo?.[0];
|
|
30
|
+
const resolvedFaceURL = conversation?.faceURL || userInfo?.faceURL;
|
|
31
|
+
const resolvedShowName = conversation?.showName || userInfo?.nickname;
|
|
32
|
+
return {
|
|
33
|
+
faceURL: resolvedFaceURL,
|
|
34
|
+
showName: resolvedShowName
|
|
35
|
+
};
|
|
36
|
+
}, [conversation, usersInfo]);
|
|
20
37
|
const rightButtons = useMemo(() => {
|
|
21
38
|
const buttons = [{
|
|
22
39
|
id: 'search',
|
|
@@ -67,8 +84,8 @@ const ChatDetailHeader = /*#__PURE__*/memo(({
|
|
|
67
84
|
onPress: onPressAvatar,
|
|
68
85
|
activeOpacity: 0.7,
|
|
69
86
|
children: [/*#__PURE__*/_jsx(AvatarSection, {
|
|
70
|
-
avatar:
|
|
71
|
-
fullName:
|
|
87
|
+
avatar: faceURL || null,
|
|
88
|
+
fullName: showName || '',
|
|
72
89
|
peerType: conversation?.peerType
|
|
73
90
|
}), /*#__PURE__*/_jsxs(KContainer.View, {
|
|
74
91
|
flex: true,
|
|
@@ -83,7 +100,7 @@ const ChatDetailHeader = /*#__PURE__*/memo(({
|
|
|
83
100
|
color: KColors.gray.dark,
|
|
84
101
|
numberOfLines: 1,
|
|
85
102
|
flex: true,
|
|
86
|
-
children:
|
|
103
|
+
children: showName || ''
|
|
87
104
|
})]
|
|
88
105
|
}), !!conversation && /*#__PURE__*/_jsx(KLabel.Text, {
|
|
89
106
|
typo: "TextSmNormal",
|
|
@@ -93,7 +110,7 @@ const ChatDetailHeader = /*#__PURE__*/memo(({
|
|
|
93
110
|
})]
|
|
94
111
|
})]
|
|
95
112
|
})]
|
|
96
|
-
}), [onBack, onPressAvatar, conversation]);
|
|
113
|
+
}), [onBack, onPressAvatar, conversation, faceURL, showName]);
|
|
97
114
|
return /*#__PURE__*/_jsx(KNavigation.Header, {
|
|
98
115
|
theme: "light",
|
|
99
116
|
alignment: "left",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useMemo","KNavigation","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","useConversation","getConversationSubtitle","jsx","_jsx","jsxs","_jsxs","ChatDetailHeader","showAddMember","conversationId","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","conversation","rightButtons","buttons","id","index","icon","vectorName","onPress","splice","leftNode","View","row","alignItems","flex","marginR","children","Touchable","height","width","center","VectorIcons","name","size","color","primary","normal","activeOpacity","avatar","
|
|
1
|
+
{"version":3,"names":["memo","useMemo","KNavigation","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","useConversation","getConversationSubtitle","useGetUsersInfo","jsx","_jsx","jsxs","_jsxs","ChatDetailHeader","showAddMember","conversationId","targetUserId","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","conversation","data","usersInfo","faceURL","showName","userInfo","resolvedFaceURL","resolvedShowName","nickname","rightButtons","buttons","id","index","icon","vectorName","onPress","splice","leftNode","View","row","alignItems","flex","marginR","children","Touchable","height","width","center","VectorIcons","name","size","color","primary","normal","activeOpacity","avatar","fullName","peerType","marginL","Text","typo","gray","dark","numberOfLines","palette","w500","Header","theme","alignment","disableCenterSpace","initRightButtons","shadow","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetailHeader.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,7 +10,7 @@ const Inbox = /*#__PURE__*/memo(({
|
|
|
10
10
|
onPressThread,
|
|
11
11
|
onPressSearch,
|
|
12
12
|
onPressEdit,
|
|
13
|
-
|
|
13
|
+
onPressContact
|
|
14
14
|
}) => {
|
|
15
15
|
const [index, setIndex] = useState(0);
|
|
16
16
|
const [routes] = useState([{
|
|
@@ -76,7 +76,7 @@ const Inbox = /*#__PURE__*/memo(({
|
|
|
76
76
|
color: KColors.palette.primary.w400
|
|
77
77
|
})
|
|
78
78
|
}), /*#__PURE__*/_jsx(KContainer.Touchable, {
|
|
79
|
-
onPress:
|
|
79
|
+
onPress: onPressContact,
|
|
80
80
|
padding: "0.5rem",
|
|
81
81
|
activeOpacity: 0.7,
|
|
82
82
|
children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
|
|
@@ -87,7 +87,7 @@ const Inbox = /*#__PURE__*/memo(({
|
|
|
87
87
|
})
|
|
88
88
|
})]
|
|
89
89
|
})]
|
|
90
|
-
}), [onPressSearch, onPressEdit,
|
|
90
|
+
}), [onPressSearch, onPressEdit, onPressContact]);
|
|
91
91
|
return /*#__PURE__*/_jsx(KContainer.Page, {
|
|
92
92
|
flex: true,
|
|
93
93
|
edges: ['top', 'bottom'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useState","StyleSheet","TabView","KContainer","KImage","KLabel","KColors","MessagesTab","jsx","_jsx","jsxs","_jsxs","Inbox","onPressThread","onPressSearch","onPressEdit","
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useState","StyleSheet","TabView","KContainer","KImage","KLabel","KColors","MessagesTab","jsx","_jsx","jsxs","_jsxs","Inbox","onPressThread","onPressSearch","onPressEdit","onPressContact","index","setIndex","routes","key","title","renderScene","route","renderTabBar","props","View","row","alignItems","style","styles","tabBar","children","flex","navigationState","map","i","isActive","Touchable","onPress","paddingV","marginR","tabItem","activeOpacity","Text","typo","color","palette","primary","w400","gray","w500","activeIndicator","actionGroup","padding","VectorIcons","name","provider","size","Page","edges","onIndexChange","swipeEnabled","length","displayName","create","borderBottomWidth","borderBottomColor","w100","paddingHorizontal","position","paddingTop","paddingBottom","bottom","left","right","height","borderRadius","backgroundColor","gap"],"sourceRoot":"../../../../src","sources":["screens/inbox/Inbox.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -14,12 +14,13 @@ export const ENDPOINTS = {
|
|
|
14
14
|
get urlMetadata() {
|
|
15
15
|
return getApiEndpoint('urlMetadata');
|
|
16
16
|
},
|
|
17
|
-
conversationFlow: id => `${getApiEndpoint('
|
|
18
|
-
resetConversationFlow: id => `${getApiEndpoint('
|
|
19
|
-
runConversationFlow: id => `${getApiEndpoint('
|
|
17
|
+
conversationFlow: id => `${getApiEndpoint('conversation')}/${id}`,
|
|
18
|
+
resetConversationFlow: id => `${getApiEndpoint('conversation')}/${id}/bot-flows/reset`,
|
|
19
|
+
runConversationFlow: id => `${getApiEndpoint('conversation')}/${id}/bot-flows/run`,
|
|
20
20
|
getConversationByBotId: botId => `${getApiEndpoint('bot')}/${botId}/conversation`,
|
|
21
|
-
conversationFlowMainMenu: id => `${getApiEndpoint('
|
|
22
|
-
getConversationStatusByBotId: botId => `${getApiEndpoint('bot')}/${botId}
|
|
21
|
+
conversationFlowMainMenu: id => `${getApiEndpoint('conversation')}/${id}/bot-flows/main-menu`,
|
|
22
|
+
getConversationStatusByBotId: botId => `${getApiEndpoint('bot')}/${botId}`,
|
|
23
|
+
createConversation: () => getApiEndpoint('conversation')
|
|
23
24
|
},
|
|
24
25
|
uploaderService: {
|
|
25
26
|
get uploadImage() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getApiEndpoint","setApiEndpoint","getAllApiEndpoints","ENDPOINTS","chatService","urlMetadata","conversationFlow","id","resetConversationFlow","runConversationFlow","getConversationByBotId","botId","conversationFlowMainMenu","getConversationStatusByBotId","uploaderService","uploadImage"],"sourceRoot":"../../../src","sources":["services/endpoints.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;;AAEA,SACEA,cAAc,EACdC,cAAc,EACdC,kBAAkB,QACb,4BAAyB;;AAEhC;AACA,OAAO,MAAMC,SAAS,GAAG;EACvBC,WAAW,EAAE;IACX,IAAIC,WAAWA,CAAA,EAAG;MAChB,OAAOL,cAAc,CAAC,aAAa,CAAC;IACtC,CAAC;IACDM,gBAAgB,EAAGC,EAAU,
|
|
1
|
+
{"version":3,"names":["getApiEndpoint","setApiEndpoint","getAllApiEndpoints","ENDPOINTS","chatService","urlMetadata","conversationFlow","id","resetConversationFlow","runConversationFlow","getConversationByBotId","botId","conversationFlowMainMenu","getConversationStatusByBotId","createConversation","uploaderService","uploadImage"],"sourceRoot":"../../../src","sources":["services/endpoints.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;;AAEA,SACEA,cAAc,EACdC,cAAc,EACdC,kBAAkB,QACb,4BAAyB;;AAEhC;AACA,OAAO,MAAMC,SAAS,GAAG;EACvBC,WAAW,EAAE;IACX,IAAIC,WAAWA,CAAA,EAAG;MAChB,OAAOL,cAAc,CAAC,aAAa,CAAC;IACtC,CAAC;IACDM,gBAAgB,EAAGC,EAAU,IAAK,GAAGP,cAAc,CAAC,cAAc,CAAC,IAAIO,EAAE,EAAE;IAC3EC,qBAAqB,EAAGD,EAAU,IAChC,GAAGP,cAAc,CAAC,cAAc,CAAC,IAAIO,EAAE,kBAAkB;IAC3DE,mBAAmB,EAAGF,EAAU,IAC9B,GAAGP,cAAc,CAAC,cAAc,CAAC,IAAIO,EAAE,gBAAgB;IACzDG,sBAAsB,EAAGC,KAAa,IACpC,GAAGX,cAAc,CAAC,KAAK,CAAC,IAAIW,KAAK,eAAe;IAClDC,wBAAwB,EAAGL,EAAU,IACnC,GAAGP,cAAc,CAAC,cAAc,CAAC,IAAIO,EAAE,sBAAsB;IAC/DM,4BAA4B,EAAGF,KAAa,IAC1C,GAAGX,cAAc,CAAC,KAAK,CAAC,IAAIW,KAAK,EAAE;IACrCG,kBAAkB,EAAEA,CAAA,KAAMd,cAAc,CAAC,cAAc;EACzD,CAAC;EACDe,eAAe,EAAE;IACf,IAAIC,WAAWA,CAAA,EAAG;MAChB,OAAOhB,cAAc,CAAC,aAAa,CAAC;IACtC;EACF;AACF,CAAC;;AAED;AACA,SAASA,cAAc,EAAEC,cAAc,EAAEC,kBAAkB","ignoreList":[]}
|
|
@@ -2,13 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
import { create } from 'zustand';
|
|
4
4
|
import { sortConversation } from "../utils/conversation.js";
|
|
5
|
+
import { apiInstance } from "../services/apis.js";
|
|
6
|
+
import { ENDPOINTS } from "../services/endpoints.js";
|
|
5
7
|
export const useConversationStore = create()((set, get) => ({
|
|
6
8
|
list: [],
|
|
7
9
|
map: {},
|
|
8
10
|
newConversationSignal: 0,
|
|
9
|
-
setCurrentConversation(id) {
|
|
11
|
+
setCurrentConversation(id, userId, groupId) {
|
|
10
12
|
set({
|
|
11
|
-
currentConversationId: id
|
|
13
|
+
currentConversationId: id,
|
|
14
|
+
currentUserId: userId,
|
|
15
|
+
currentGroupId: groupId
|
|
12
16
|
});
|
|
13
17
|
},
|
|
14
18
|
getCurrentConversation() {
|
|
@@ -45,12 +49,29 @@ export const useConversationStore = create()((set, get) => ({
|
|
|
45
49
|
list: get().list.filter(item => item !== id)
|
|
46
50
|
});
|
|
47
51
|
},
|
|
52
|
+
createConversation: async params => {
|
|
53
|
+
set({
|
|
54
|
+
isCreatingConversation: true
|
|
55
|
+
});
|
|
56
|
+
const res = await apiInstance?.post(ENDPOINTS.chatService.createConversation(), params);
|
|
57
|
+
if (res?.data?.data?.conversationId) {
|
|
58
|
+
set({
|
|
59
|
+
currentConversationId: res?.data?.data?.conversationId,
|
|
60
|
+
isCreatingConversation: false
|
|
61
|
+
});
|
|
62
|
+
} else {
|
|
63
|
+
set({
|
|
64
|
+
isCreatingConversation: false
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
},
|
|
48
68
|
reset() {
|
|
49
69
|
set({
|
|
50
70
|
currentConversationId: undefined,
|
|
51
71
|
list: [],
|
|
52
72
|
map: {},
|
|
53
|
-
newConversationSignal: 0
|
|
73
|
+
newConversationSignal: 0,
|
|
74
|
+
isCreatingConversation: false
|
|
54
75
|
});
|
|
55
76
|
}
|
|
56
77
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["create","sortConversation","useConversationStore","set","get","list","map","newConversationSignal","setCurrentConversation","id","currentConversationId","getCurrentConversation","updateConversation","data","existing","updateConversations","conversations","reduce","pre","curr","conversationID","removeConversation","newMap","filter","item","reset","undefined","useConversation","state"],"sourceRoot":"../../../src","sources":["store/conversation.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,SAAS;AAChC,SAASC,gBAAgB,QAAQ,0BAAuB;
|
|
1
|
+
{"version":3,"names":["create","sortConversation","apiInstance","ENDPOINTS","useConversationStore","set","get","list","map","newConversationSignal","setCurrentConversation","id","userId","groupId","currentConversationId","currentUserId","currentGroupId","getCurrentConversation","updateConversation","data","existing","updateConversations","conversations","reduce","pre","curr","conversationID","removeConversation","newMap","filter","item","createConversation","params","isCreatingConversation","res","post","chatService","conversationId","reset","undefined","useConversation","state"],"sourceRoot":"../../../src","sources":["store/conversation.ts"],"mappings":"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","ignoreList":[]}
|