@droppii-org/chat-mobile 0.2.31 → 0.2.33
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/components/ThreadCard/ThreadCard.js +4 -0
- package/lib/module/components/ThreadCard/ThreadCard.js.map +1 -1
- package/lib/module/context/ChatContext.js +46 -12
- package/lib/module/context/ChatContext.js.map +1 -1
- package/lib/module/context/global.js +6 -0
- package/lib/module/context/global.js.map +1 -0
- package/lib/module/core/useChatListener.js +48 -12
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/hooks/message/usePinMessage.js +133 -0
- package/lib/module/hooks/message/usePinMessage.js.map +1 -0
- package/lib/module/hooks/message/useSendMessage.js +9 -3
- package/lib/module/hooks/message/useSendMessage.js.map +1 -1
- package/lib/module/hooks/useChatMessages.js +5 -1
- package/lib/module/hooks/useChatMessages.js.map +1 -1
- package/lib/module/hooks/useImageAttachment.js +2 -0
- package/lib/module/hooks/useImageAttachment.js.map +1 -1
- package/lib/module/index.js +9 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/screens/chat-detail/ChatDetail.js +13 -1
- package/lib/module/screens/chat-detail/ChatDetail.js.map +1 -1
- package/lib/module/screens/chat-detail/PinnedMessageBar.js +158 -0
- package/lib/module/screens/chat-detail/PinnedMessageBar.js.map +1 -0
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js +47 -10
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js.map +1 -1
- package/lib/module/screens/chat-detail/messageToolbox/MessageToolboxMenu.js +16 -0
- package/lib/module/screens/chat-detail/messageToolbox/MessageToolboxMenu.js.map +1 -1
- package/lib/module/screens/chat-detail/messageToolbox/MessageToolboxOverlay.js +15 -1
- package/lib/module/screens/chat-detail/messageToolbox/MessageToolboxOverlay.js.map +1 -1
- package/lib/module/screens/chat-detail/messageToolbox/messageToolbox.utils.js +16 -1
- package/lib/module/screens/chat-detail/messageToolbox/messageToolbox.utils.js.map +1 -1
- package/lib/module/services/attachmentOrchestrator.js +3 -1
- package/lib/module/services/attachmentOrchestrator.js.map +1 -1
- package/lib/module/store/pinnedMessage.js +34 -0
- package/lib/module/store/pinnedMessage.js.map +1 -0
- package/lib/module/translation/resources/i18n.js +12 -0
- package/lib/module/translation/resources/i18n.js.map +1 -1
- package/lib/module/types/chat.js.map +1 -1
- package/lib/module/utils/messageUtils.js +77 -1
- package/lib/module/utils/messageUtils.js.map +1 -1
- package/lib/module/utils/toastFlashMessage.js +56 -0
- package/lib/module/utils/toastFlashMessage.js.map +1 -0
- package/lib/typescript/src/components/ThreadCard/ThreadCard.d.ts.map +1 -1
- package/lib/typescript/src/context/ChatContext.d.ts.map +1 -1
- package/lib/typescript/src/context/global.d.ts +3 -0
- package/lib/typescript/src/context/global.d.ts.map +1 -0
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/hooks/message/usePinMessage.d.ts +9 -0
- package/lib/typescript/src/hooks/message/usePinMessage.d.ts.map +1 -0
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts +3 -1
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useChatMessages.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useImageAttachment.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +4 -3
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatDetail.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessageBar.d.ts +8 -0
- package/lib/typescript/src/screens/chat-detail/PinnedMessageBar.d.ts.map +1 -0
- package/lib/typescript/src/screens/chat-detail/legend/LegendChatMessage.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/messageToolbox/MessageToolboxMenu.d.ts +5 -1
- package/lib/typescript/src/screens/chat-detail/messageToolbox/MessageToolboxMenu.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/messageToolbox/MessageToolboxOverlay.d.ts +2 -0
- package/lib/typescript/src/screens/chat-detail/messageToolbox/MessageToolboxOverlay.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/messageToolbox/messageToolbox.utils.d.ts +4 -0
- package/lib/typescript/src/screens/chat-detail/messageToolbox/messageToolbox.utils.d.ts.map +1 -1
- package/lib/typescript/src/services/attachmentOrchestrator.d.ts.map +1 -1
- package/lib/typescript/src/store/pinnedMessage.d.ts +11 -0
- package/lib/typescript/src/store/pinnedMessage.d.ts.map +1 -0
- package/lib/typescript/src/translation/resources/i18n.d.ts.map +1 -1
- package/lib/typescript/src/types/chat.d.ts +8 -1
- package/lib/typescript/src/types/chat.d.ts.map +1 -1
- package/lib/typescript/src/types/imageUpload.d.ts +1 -1
- package/lib/typescript/src/types/imageUpload.d.ts.map +1 -1
- package/lib/typescript/src/utils/messageUtils.d.ts +8 -0
- package/lib/typescript/src/utils/messageUtils.d.ts.map +1 -1
- package/lib/typescript/src/utils/toastFlashMessage.d.ts +12 -0
- package/lib/typescript/src/utils/toastFlashMessage.d.ts.map +1 -0
- package/package.json +5 -3
- package/src/components/ThreadCard/ThreadCard.tsx +4 -0
- package/src/context/ChatContext.tsx +66 -9
- package/src/context/global.ts +6 -0
- package/src/core/useChatListener.ts +73 -11
- package/src/hooks/message/usePinMessage.ts +153 -0
- package/src/hooks/message/useSendMessage.ts +13 -9
- package/src/hooks/useChatMessages.ts +6 -2
- package/src/hooks/useImageAttachment.ts +2 -0
- package/src/index.tsx +10 -18
- package/src/screens/chat-detail/ChatDetail.tsx +12 -0
- package/src/screens/chat-detail/PinnedMessageBar.tsx +177 -0
- package/src/screens/chat-detail/legend/LegendChatMessage.tsx +47 -10
- package/src/screens/chat-detail/messageToolbox/MessageToolboxMenu.tsx +24 -0
- package/src/screens/chat-detail/messageToolbox/MessageToolboxOverlay.tsx +142 -116
- package/src/screens/chat-detail/messageToolbox/messageToolbox.utils.ts +31 -0
- package/src/services/attachmentOrchestrator.ts +2 -0
- package/src/store/pinnedMessage.ts +38 -0
- package/src/translation/resources/i18n.ts +13 -0
- package/src/types/chat.ts +8 -1
- package/src/types/imageUpload.ts +1 -1
- package/src/utils/messageUtils.ts +91 -3
- package/src/utils/toastFlashMessage.ts +67 -0
|
@@ -12,6 +12,7 @@ import { useConversation, useUserStore } from "../../store/index.js";
|
|
|
12
12
|
import { MessageReceiveOptType } from '@droppii/openim-rn-client-sdk';
|
|
13
13
|
import { MuteThread } from "./MuteThread.js";
|
|
14
14
|
import { useIsJoinedGroup } from "../../hooks/useIsJoinedGroup.js";
|
|
15
|
+
import isEmpty from 'lodash/isEmpty';
|
|
15
16
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
16
17
|
const ThreadCard = /*#__PURE__*/memo(({
|
|
17
18
|
item,
|
|
@@ -35,6 +36,9 @@ const ThreadCard = /*#__PURE__*/memo(({
|
|
|
35
36
|
const isNotInGroup = groupID ? !isJoinedGroup : false;
|
|
36
37
|
const latestMsgData = useMemo(() => {
|
|
37
38
|
let result = null;
|
|
39
|
+
if (isEmpty(latestMsg)) {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
38
42
|
try {
|
|
39
43
|
result = JSON.parse(latestMsg || '{}');
|
|
40
44
|
} catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useMemo","ReanimatedSwipeable","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","useConversation","useUserStore","MessageReceiveOptType","MuteThread","useIsJoinedGroup","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ThreadCard","item","onPress","conversation","peerType","showName","faceURL","unreadCount","recvMsgOpt","Normal","isPinned","latestMsgSendTime","latestMsg","groupID","data","isJoinedGroup","isNotInGroup","latestMsgData","result","JSON","parse","error","console","fullName","hasUnread","isMuted","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","renderRightActions","_progress","_translation","swipeableMethods","children","VisibleView","visible","friction","rightThreshold","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","background","white","avatar","View","flex","marginL","paddingB","Text","typo","numberOfLines","color","black","VectorIcons","name","provider","size","palette","gray","w500","Boolean","w400","normal","count","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAElD,OAAOC,mBAAmB,MAAM,kDAAkD;AAElF,SAASC,UAAU,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,QAAQ,eAAe;AACnE,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,cAAc,QAAQ,qBAAkB;AACjD,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,eAAe,QAAQ,8BAA2B;AAC3D,SAASC,kBAAkB,QAAQ,6BAA0B;AAC7D,SAASC,eAAe,EAAEC,YAAY,QAAQ,sBAAa;AAC3D,SACEC,qBAAqB,QAEhB,+BAA+B;AACtC,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,gBAAgB,QAAQ,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useMemo","ReanimatedSwipeable","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","useConversation","useUserStore","MessageReceiveOptType","MuteThread","useIsJoinedGroup","isEmpty","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ThreadCard","item","onPress","conversation","peerType","showName","faceURL","unreadCount","recvMsgOpt","Normal","isPinned","latestMsgSendTime","latestMsg","groupID","data","isJoinedGroup","isNotInGroup","latestMsgData","result","JSON","parse","error","console","fullName","hasUnread","isMuted","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","renderRightActions","_progress","_translation","swipeableMethods","children","VisibleView","visible","friction","rightThreshold","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","background","white","avatar","View","flex","marginL","paddingB","Text","typo","numberOfLines","color","black","VectorIcons","name","provider","size","palette","gray","w500","Boolean","w400","normal","count","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
|
|
3
|
+
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
|
4
4
|
import OpenIMSDK, { LoginStatus } from '@droppii/openim-rn-client-sdk';
|
|
5
|
+
import Toast from 'react-native-toast-message';
|
|
5
6
|
import { useUserStore } from "../store/index.js";
|
|
6
|
-
import {
|
|
7
|
+
import { useChatSdk } from "../core/index.js";
|
|
8
|
+
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
9
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
7
10
|
export const ChatContext = /*#__PURE__*/createContext(undefined);
|
|
8
11
|
export const useChatContext = () => {
|
|
9
12
|
const context = useContext(ChatContext);
|
|
@@ -16,14 +19,11 @@ const ChatProviderInner = ({
|
|
|
16
19
|
logGA,
|
|
17
20
|
children,
|
|
18
21
|
applicationType,
|
|
19
|
-
getChatToken
|
|
22
|
+
getChatToken,
|
|
23
|
+
onFlashMessagePress
|
|
20
24
|
}) => {
|
|
21
25
|
const connectStatus = useUserStore(state => state.connectStatus);
|
|
22
|
-
const
|
|
23
|
-
logGA,
|
|
24
|
-
applicationType,
|
|
25
|
-
getChatToken
|
|
26
|
-
}), [logGA, applicationType, getChatToken]);
|
|
26
|
+
const [isShowFLashMessage, setShow] = useState(true);
|
|
27
27
|
const handleSdkLogin = useCallback(async () => {
|
|
28
28
|
if (!!getChatToken && connectStatus === LoginStatus.Logout) {
|
|
29
29
|
const res = await getChatToken();
|
|
@@ -42,14 +42,48 @@ const ChatProviderInner = ({
|
|
|
42
42
|
useEffect(() => {
|
|
43
43
|
handleSdkLogin();
|
|
44
44
|
}, [handleSdkLogin]);
|
|
45
|
+
const onPressFlashMessage = useCallback(c => {
|
|
46
|
+
onFlashMessagePress?.(c);
|
|
47
|
+
}, [onFlashMessagePress]);
|
|
48
|
+
const setIsShowFLashMessage = useCallback(v => {
|
|
49
|
+
console.log('setIsShowFLashMessage');
|
|
50
|
+
setShow(v);
|
|
51
|
+
}, []);
|
|
52
|
+
const value = useMemo(() => ({
|
|
53
|
+
logGA,
|
|
54
|
+
applicationType,
|
|
55
|
+
getChatToken,
|
|
56
|
+
onPressFlashMessage,
|
|
57
|
+
isShowFLashMessage: isShowFLashMessage,
|
|
58
|
+
setIsShowFLashMessage: setIsShowFLashMessage
|
|
59
|
+
}), [logGA, applicationType, getChatToken, onPressFlashMessage, isShowFLashMessage, setIsShowFLashMessage]);
|
|
60
|
+
const {
|
|
61
|
+
top
|
|
62
|
+
} = useSafeAreaInsets();
|
|
45
63
|
return /*#__PURE__*/_jsx(ChatContext.Provider, {
|
|
46
64
|
value: value,
|
|
47
|
-
children:
|
|
65
|
+
children: /*#__PURE__*/_jsxs(_Fragment, {
|
|
66
|
+
children: [/*#__PURE__*/_jsx(ChatSdkBridge, {}), children, /*#__PURE__*/_jsx(Toast, {
|
|
67
|
+
topOffset: top
|
|
68
|
+
})]
|
|
69
|
+
})
|
|
48
70
|
});
|
|
49
71
|
};
|
|
72
|
+
|
|
73
|
+
// useChatSdk() -> useChatListener() -> useFlashMessagePress() reads from
|
|
74
|
+
// ChatContext via useChatContext(), which throws unless called by a
|
|
75
|
+
// descendant of ChatContext.Provider. ChatProviderInner IS the component
|
|
76
|
+
// that creates the Provider, so it cannot consume its own context — this
|
|
77
|
+
// bridge exists purely to run useChatSdk() one level below the Provider.
|
|
78
|
+
const ChatSdkBridge = () => {
|
|
79
|
+
useChatSdk();
|
|
80
|
+
return null;
|
|
81
|
+
};
|
|
50
82
|
export const ChatProvider = ({
|
|
51
83
|
...props
|
|
52
|
-
}) =>
|
|
53
|
-
|
|
54
|
-
|
|
84
|
+
}) => {
|
|
85
|
+
return /*#__PURE__*/_jsx(ChatProviderInner, {
|
|
86
|
+
...props
|
|
87
|
+
});
|
|
88
|
+
};
|
|
55
89
|
//# sourceMappingURL=ChatContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","OpenIMSDK","LoginStatus","useUserStore","jsx","_jsx","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","connectStatus","state","
|
|
1
|
+
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useUserStore","useChatSdk","useSafeAreaInsets","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","connectStatus","state","isShowFLashMessage","setShow","handleSdkLogin","Logout","res","id","token","login","userID","then","getState","updateConnectStatus","Logged","catch","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","log","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { useChatContext } from "./ChatContext.js";
|
|
4
|
+
export const useGetIsShowFLashMessage = () => useChatContext?.().isShowFLashMessage;
|
|
5
|
+
export const useSetIsShowFLashMessage = () => useChatContext?.().setIsShowFLashMessage;
|
|
6
|
+
//# sourceMappingURL=global.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useChatContext","useGetIsShowFLashMessage","isShowFLashMessage","useSetIsShowFLashMessage","setIsShowFLashMessage"],"sourceRoot":"../../../src","sources":["context/global.ts"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,kBAAe;AAE9C,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KACtCD,cAAc,GAAG,CAAC,CAACE,kBAAkB;AACvC,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KACtCH,cAAc,GAAG,CAAC,CAACI,qBAAqB","ignoreList":[]}
|
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import OpenIMSDK, { OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
3
|
+
import OpenIMSDK, { MessageReceiveOptType, OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
4
4
|
import { useCallback, useEffect } from 'react';
|
|
5
5
|
import { useConversationStore } from "../store/conversation.js";
|
|
6
|
+
import { ToastFlashMessage } from "../utils/toastFlashMessage.js";
|
|
7
|
+
import { useUserStore } from "../store/user.js";
|
|
8
|
+
import { getLastMessageText } from "../utils/messageUtils.js";
|
|
9
|
+
import { useChatContext } from "../context/index.js";
|
|
10
|
+
import isEmpty from 'lodash/isEmpty';
|
|
6
11
|
import { markMessageRevoked, useMessageStore } from "../store/message.js";
|
|
12
|
+
import { syncPinnedMessagesOnEvent } from "../hooks/message/usePinMessage.js";
|
|
7
13
|
export const useChatListener = () => {
|
|
8
14
|
const updateOneMessage = useMessageStore(state => state.updateOneMessage);
|
|
15
|
+
const currentUserId = useUserStore(s => s.user?.userID);
|
|
16
|
+
const onPressFlashMessage = useChatContext()?.onPressFlashMessage;
|
|
17
|
+
const isShowFLashMessage = useChatContext()?.isShowFLashMessage;
|
|
9
18
|
const onSendMessageProgress = useCallback(({
|
|
10
19
|
progress,
|
|
11
20
|
message
|
|
@@ -18,17 +27,29 @@ export const useChatListener = () => {
|
|
|
18
27
|
updateOneMessage(message);
|
|
19
28
|
}, [updateOneMessage]);
|
|
20
29
|
const onConversationChanged = useCallback(conversations => {
|
|
21
|
-
console.log('
|
|
22
|
-
count: conversations.length,
|
|
23
|
-
ids: conversations.map(c => c.conversationID)
|
|
24
|
-
});
|
|
30
|
+
// console.log('isShowFLashMessage', isShowFLashMessage);
|
|
25
31
|
useConversationStore.getState().updateConversations(conversations);
|
|
26
|
-
|
|
32
|
+
if (isShowFLashMessage) {
|
|
33
|
+
for (const conversation of conversations) {
|
|
34
|
+
if (conversation.recvMsgOpt === MessageReceiveOptType.NotNotify && !isEmpty(conversation?.latestMsg)) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
37
|
+
const latestMsg = JSON.parse(conversation.latestMsg || '{}');
|
|
38
|
+
const lastMessageText = getLastMessageText(latestMsg, currentUserId, conversation);
|
|
39
|
+
ToastFlashMessage.show({
|
|
40
|
+
key: conversation.conversationID,
|
|
41
|
+
title: conversation.showName || 'New Message',
|
|
42
|
+
body: lastMessageText,
|
|
43
|
+
onPress: () => {
|
|
44
|
+
ToastFlashMessage.hide(conversation.conversationID);
|
|
45
|
+
onPressFlashMessage?.(conversation);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}, [currentUserId, isShowFLashMessage, onPressFlashMessage]);
|
|
27
51
|
const onNewConversation = useCallback(conversations => {
|
|
28
|
-
console.log('[Listener] OnNewConversation',
|
|
29
|
-
count: conversations.length,
|
|
30
|
-
ids: conversations.map(c => c.conversationID)
|
|
31
|
-
});
|
|
52
|
+
console.log('[Listener] OnNewConversation', conversations);
|
|
32
53
|
useConversationStore.getState().updateConversations(conversations);
|
|
33
54
|
}, []);
|
|
34
55
|
const onGroupMemberAdded = useCallback(member => {
|
|
@@ -46,10 +67,23 @@ export const useChatListener = () => {
|
|
|
46
67
|
const onMessageRevoked = useCallback(revokedInfo => {
|
|
47
68
|
markMessageRevoked(revokedInfo.clientMsgID);
|
|
48
69
|
}, []);
|
|
70
|
+
const onMessagePinned = useCallback(messagePinned => {
|
|
71
|
+
const currentConversationId = useConversationStore.getState().currentConversationId;
|
|
72
|
+
if (messagePinned.conversationID === currentConversationId) {
|
|
73
|
+
updateOneMessage({
|
|
74
|
+
clientMsgID: messagePinned.clientMsgID,
|
|
75
|
+
isPinned: messagePinned.isPinned,
|
|
76
|
+
pinnedByUserID: messagePinned.isPinned ? messagePinned.operatorUserID : undefined,
|
|
77
|
+
pinnedTime: messagePinned.isPinned ? messagePinned.pinnedTime : undefined
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
syncPinnedMessagesOnEvent(messagePinned.conversationID);
|
|
81
|
+
}, [updateOneMessage]);
|
|
49
82
|
useEffect(() => {
|
|
50
83
|
// Conversation
|
|
51
84
|
OpenIMSDK.on(OpenIMEvent.OnConversationChanged, onConversationChanged);
|
|
52
85
|
OpenIMSDK.on(OpenIMEvent.OnNewConversation, onNewConversation);
|
|
86
|
+
// OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
53
87
|
|
|
54
88
|
// Group members
|
|
55
89
|
OpenIMSDK.on(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
|
|
@@ -58,6 +92,7 @@ export const useChatListener = () => {
|
|
|
58
92
|
// Message status
|
|
59
93
|
OpenIMSDK.on(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
|
|
60
94
|
OpenIMSDK.on(OpenIMEvent.OnNewRecvMessageRevoked, onMessageRevoked);
|
|
95
|
+
OpenIMSDK.on(OpenIMEvent.OnRecvMessagePinned, onMessagePinned);
|
|
61
96
|
return () => {
|
|
62
97
|
// Conversation
|
|
63
98
|
OpenIMSDK.off(OpenIMEvent.OnConversationChanged, onConversationChanged);
|
|
@@ -69,9 +104,10 @@ export const useChatListener = () => {
|
|
|
69
104
|
|
|
70
105
|
// Message status
|
|
71
106
|
OpenIMSDK.off(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
|
|
107
|
+
// OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
72
108
|
OpenIMSDK.off(OpenIMEvent.OnNewRecvMessageRevoked, onMessageRevoked);
|
|
109
|
+
OpenIMSDK.off(OpenIMEvent.OnRecvMessagePinned, onMessagePinned);
|
|
73
110
|
};
|
|
74
|
-
|
|
75
|
-
}, []);
|
|
111
|
+
}, [onConversationChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessagePinned, onMessageRevoked, onNewConversation, onSendMessageProgress]);
|
|
76
112
|
};
|
|
77
113
|
//# sourceMappingURL=useChatListener.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useConversationStore","markMessageRevoked","useMessageStore","useChatListener","updateOneMessage","state","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","getState","updateConversations","conversation","recvMsgOpt","NotNotify","latestMsg","JSON","parse","lastMessageText","show","key","conversationID","title","showName","body","onPress","hide","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","onMessageRevoked","revokedInfo","onMessagePinned","messagePinned","currentConversationId","isPinned","pinnedByUserID","operatorUserID","undefined","pinnedTime","on","OnConversationChanged","OnNewConversation","OnGroupMemberAdded","OnGroupMemberDeleted","SendMessageProgress","OnNewRecvMessageRevoked","OnRecvMessagePinned","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { useCallback, useEffect } from 'react';
|
|
4
|
+
import OpenIMSDK from '@droppii/openim-rn-client-sdk';
|
|
5
|
+
import { useConversationStore } from "../../store/conversation.js";
|
|
6
|
+
import { useMessageStore } from "../../store/message.js";
|
|
7
|
+
import { usePinnedMessageStore } from "../../store/pinnedMessage.js";
|
|
8
|
+
import { useUserStore } from "../../store/user.js";
|
|
9
|
+
import { UIUtils } from "../../utils/UIUtils.js";
|
|
10
|
+
import { trans } from "../../translation/index.js";
|
|
11
|
+
const MAX_PINNED_MESSAGES = 5;
|
|
12
|
+
export const fetchPinnedMessages = async conversationID => {
|
|
13
|
+
const result = await OpenIMSDK.getPinnedMessageList({
|
|
14
|
+
conversationID,
|
|
15
|
+
offset: 0,
|
|
16
|
+
pageSize: MAX_PINNED_MESSAGES
|
|
17
|
+
});
|
|
18
|
+
const previouslyPinnedIds = new Set(usePinnedMessageStore.getState().messages.map(msg => msg.clientMsgID));
|
|
19
|
+
const pinnedIds = new Set(result.messageList.map(msg => msg.clientMsgID));
|
|
20
|
+
usePinnedMessageStore.getState().setMessages(result.messageList, result.totalCount);
|
|
21
|
+
|
|
22
|
+
// Reconcile the per-message `isPinned` flag (used by the toolbox and the
|
|
23
|
+
// pinned badge) with the authoritative list from the server — messages
|
|
24
|
+
// pinned outside this session (before remount, or from another device)
|
|
25
|
+
// never get this flag set otherwise.
|
|
26
|
+
const {
|
|
27
|
+
updateOneMessage
|
|
28
|
+
} = useMessageStore.getState();
|
|
29
|
+
pinnedIds.forEach(clientMsgID => {
|
|
30
|
+
updateOneMessage({
|
|
31
|
+
clientMsgID,
|
|
32
|
+
isPinned: true
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
previouslyPinnedIds.forEach(clientMsgID => {
|
|
36
|
+
if (!pinnedIds.has(clientMsgID)) {
|
|
37
|
+
updateOneMessage({
|
|
38
|
+
clientMsgID,
|
|
39
|
+
isPinned: false
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
const showPinLimitReachedModal = () => {
|
|
45
|
+
UIUtils.alert.open({
|
|
46
|
+
title: trans('chat:pin_limit_title'),
|
|
47
|
+
message: trans('chat:pin_limit_desc'),
|
|
48
|
+
primaryIndex: 0,
|
|
49
|
+
buttons: [{
|
|
50
|
+
label: trans('chat:pin_limit_primary'),
|
|
51
|
+
kind: 'primary',
|
|
52
|
+
onPress: () => {}
|
|
53
|
+
}]
|
|
54
|
+
});
|
|
55
|
+
};
|
|
56
|
+
export const usePinMessage = conversationID => {
|
|
57
|
+
const pinnedMessages = usePinnedMessageStore(state => state.messages);
|
|
58
|
+
const addMessage = usePinnedMessageStore(state => state.addMessage);
|
|
59
|
+
const removeMessage = usePinnedMessageStore(state => state.removeMessage);
|
|
60
|
+
const reset = usePinnedMessageStore(state => state.reset);
|
|
61
|
+
useEffect(() => {
|
|
62
|
+
if (!conversationID) return;
|
|
63
|
+
fetchPinnedMessages(conversationID).catch(error => {
|
|
64
|
+
console.error('fetchPinnedMessages', error);
|
|
65
|
+
});
|
|
66
|
+
return () => {
|
|
67
|
+
reset();
|
|
68
|
+
};
|
|
69
|
+
}, [conversationID, reset]);
|
|
70
|
+
const pinMessage = useCallback(async message => {
|
|
71
|
+
if (!conversationID) return;
|
|
72
|
+
if (pinnedMessages.length >= MAX_PINNED_MESSAGES) {
|
|
73
|
+
showPinLimitReachedModal();
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
try {
|
|
77
|
+
await OpenIMSDK.pinMsg(conversationID, message.clientMsgID);
|
|
78
|
+
addMessage(message);
|
|
79
|
+
useMessageStore.getState().updateOneMessage({
|
|
80
|
+
clientMsgID: message.clientMsgID,
|
|
81
|
+
isPinned: true,
|
|
82
|
+
pinnedByUserID: useUserStore.getState().user?.userID,
|
|
83
|
+
pinnedTime: Date.now()
|
|
84
|
+
});
|
|
85
|
+
UIUtils.toast.open({
|
|
86
|
+
title: trans('chat:pin_message_success'),
|
|
87
|
+
theme: 'success'
|
|
88
|
+
});
|
|
89
|
+
} catch (error) {
|
|
90
|
+
console.error('pinMessage', error);
|
|
91
|
+
UIUtils.toast.open({
|
|
92
|
+
title: trans('chat:generic_error'),
|
|
93
|
+
theme: 'error'
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}, [conversationID, pinnedMessages.length, addMessage]);
|
|
97
|
+
const unpinMessage = useCallback(async message => {
|
|
98
|
+
if (!conversationID) return;
|
|
99
|
+
try {
|
|
100
|
+
await OpenIMSDK.unpinMsg(conversationID, message.clientMsgID);
|
|
101
|
+
removeMessage(message.clientMsgID);
|
|
102
|
+
useMessageStore.getState().updateOneMessage({
|
|
103
|
+
clientMsgID: message.clientMsgID,
|
|
104
|
+
isPinned: false,
|
|
105
|
+
pinnedByUserID: undefined,
|
|
106
|
+
pinnedTime: undefined
|
|
107
|
+
});
|
|
108
|
+
UIUtils.toast.open({
|
|
109
|
+
title: trans('chat:unpin_message_success'),
|
|
110
|
+
theme: 'success'
|
|
111
|
+
});
|
|
112
|
+
} catch (error) {
|
|
113
|
+
console.error('unpinMessage', error);
|
|
114
|
+
UIUtils.toast.open({
|
|
115
|
+
title: trans('chat:generic_error'),
|
|
116
|
+
theme: 'error'
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
}, [conversationID, removeMessage]);
|
|
120
|
+
return {
|
|
121
|
+
pinnedMessages,
|
|
122
|
+
pinMessage,
|
|
123
|
+
unpinMessage
|
|
124
|
+
};
|
|
125
|
+
};
|
|
126
|
+
export const syncPinnedMessagesOnEvent = conversationID => {
|
|
127
|
+
const currentConversationId = useConversationStore.getState().currentConversationId;
|
|
128
|
+
if (conversationID !== currentConversationId) return;
|
|
129
|
+
fetchPinnedMessages(conversationID).catch(error => {
|
|
130
|
+
console.error('syncPinnedMessagesOnEvent', error);
|
|
131
|
+
});
|
|
132
|
+
};
|
|
133
|
+
//# sourceMappingURL=usePinMessage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","OpenIMSDK","useConversationStore","useMessageStore","usePinnedMessageStore","useUserStore","UIUtils","trans","MAX_PINNED_MESSAGES","fetchPinnedMessages","conversationID","result","getPinnedMessageList","offset","pageSize","previouslyPinnedIds","Set","getState","messages","map","msg","clientMsgID","pinnedIds","messageList","setMessages","totalCount","updateOneMessage","forEach","isPinned","has","showPinLimitReachedModal","alert","open","title","message","primaryIndex","buttons","label","kind","onPress","usePinMessage","pinnedMessages","state","addMessage","removeMessage","reset","catch","error","console","pinMessage","length","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,mBAAmB,GAAG,CAAC;AAE7B,OAAO,MAAMC,mBAAmB,GAAG,MAAOC,cAAsB,IAAK;EACnE,MAAMC,MAAM,GAAG,MAAMV,SAAS,CAACW,oBAAoB,CAAC;IAClDF,cAAc;IACdG,MAAM,EAAE,CAAC;IACTC,QAAQ,EAAEN;EACZ,CAAC,CAAC;EAEF,MAAMO,mBAAmB,GAAG,IAAIC,GAAG,CACjCZ,qBAAqB,CAACa,QAAQ,CAAC,CAAC,CAACC,QAAQ,CAACC,GAAG,CAAEC,GAAG,IAAKA,GAAG,CAACC,WAAW,CACxE,CAAC;EACD,MAAMC,SAAS,GAAG,IAAIN,GAAG,CAACL,MAAM,CAACY,WAAW,CAACJ,GAAG,CAAEC,GAAG,IAAKA,GAAG,CAACC,WAAW,CAAC,CAAC;EAE3EjB,qBAAqB,CAClBa,QAAQ,CAAC,CAAC,CACVO,WAAW,CAACb,MAAM,CAACY,WAAW,EAAEZ,MAAM,CAACc,UAAU,CAAC;;EAErD;EACA;EACA;EACA;EACA,MAAM;IAAEC;EAAiB,CAAC,GAAGvB,eAAe,CAACc,QAAQ,CAAC,CAAC;EACvDK,SAAS,CAACK,OAAO,CAAEN,WAAW,IAAK;IACjCK,gBAAgB,CAAC;MAAEL,WAAW;MAAEO,QAAQ,EAAE;IAAK,CAAC,CAAC;EACnD,CAAC,CAAC;EACFb,mBAAmB,CAACY,OAAO,CAAEN,WAAW,IAAK;IAC3C,IAAI,CAACC,SAAS,CAACO,GAAG,CAACR,WAAW,CAAC,EAAE;MAC/BK,gBAAgB,CAAC;QAAEL,WAAW;QAAEO,QAAQ,EAAE;MAAM,CAAC,CAAC;IACpD;EACF,CAAC,CAAC;AACJ,CAAC;AAED,MAAME,wBAAwB,GAAGA,CAAA,KAAM;EACrCxB,OAAO,CAACyB,KAAK,CAACC,IAAI,CAAC;IACjBC,KAAK,EAAE1B,KAAK,CAAC,sBAAsB,CAAC;IACpC2B,OAAO,EAAE3B,KAAK,CAAC,qBAAqB,CAAC;IACrC4B,YAAY,EAAE,CAAC;IACfC,OAAO,EAAE,CACP;MACEC,KAAK,EAAE9B,KAAK,CAAC,wBAAwB,CAAC;MACtC+B,IAAI,EAAE,SAAS;MACfC,OAAO,EAAEA,CAAA,KAAM,CAAC;IAClB,CAAC;EAEL,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMC,aAAa,GAAI9B,cAAuB,IAAK;EACxD,MAAM+B,cAAc,GAAGrC,qBAAqB,CAAEsC,KAAK,IAAKA,KAAK,CAACxB,QAAQ,CAAC;EACvE,MAAMyB,UAAU,GAAGvC,qBAAqB,CAAEsC,KAAK,IAAKA,KAAK,CAACC,UAAU,CAAC;EACrE,MAAMC,aAAa,GAAGxC,qBAAqB,CAAEsC,KAAK,IAAKA,KAAK,CAACE,aAAa,CAAC;EAC3E,MAAMC,KAAK,GAAGzC,qBAAqB,CAAEsC,KAAK,IAAKA,KAAK,CAACG,KAAK,CAAC;EAE3D7C,SAAS,CAAC,MAAM;IACd,IAAI,CAACU,cAAc,EAAE;IAErBD,mBAAmB,CAACC,cAAc,CAAC,CAACoC,KAAK,CAAEC,KAAK,IAAK;MACnDC,OAAO,CAACD,KAAK,CAAC,qBAAqB,EAAEA,KAAK,CAAC;IAC7C,CAAC,CAAC;IAEF,OAAO,MAAM;MACXF,KAAK,CAAC,CAAC;IACT,CAAC;EACH,CAAC,EAAE,CAACnC,cAAc,EAAEmC,KAAK,CAAC,CAAC;EAE3B,MAAMI,UAAU,GAAGlD,WAAW,CAC5B,MAAOmC,OAAoB,IAAK;IAC9B,IAAI,CAACxB,cAAc,EAAE;IAErB,IAAI+B,cAAc,CAACS,MAAM,IAAI1C,mBAAmB,EAAE;MAChDsB,wBAAwB,CAAC,CAAC;MAC1B;IACF;IAEA,IAAI;MACF,MAAM7B,SAAS,CAACkD,MAAM,CAACzC,cAAc,EAAEwB,OAAO,CAACb,WAAW,CAAC;MAC3DsB,UAAU,CAACT,OAAO,CAAC;MACnB/B,eAAe,CAACc,QAAQ,CAAC,CAAC,CAACS,gBAAgB,CAAC;QAC1CL,WAAW,EAAEa,OAAO,CAACb,WAAW;QAChCO,QAAQ,EAAE,IAAI;QACdwB,cAAc,EAAE/C,YAAY,CAACY,QAAQ,CAAC,CAAC,CAACoC,IAAI,EAAEC,MAAM;QACpDC,UAAU,EAAEC,IAAI,CAACC,GAAG,CAAC;MACvB,CAAC,CAAC;MACFnD,OAAO,CAACoD,KAAK,CAAC1B,IAAI,CAAC;QACjBC,KAAK,EAAE1B,KAAK,CAAC,0BAA0B,CAAC;QACxCoD,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOZ,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,YAAY,EAAEA,KAAK,CAAC;MAClCzC,OAAO,CAACoD,KAAK,CAAC1B,IAAI,CAAC;QACjBC,KAAK,EAAE1B,KAAK,CAAC,oBAAoB,CAAC;QAClCoD,KAAK,EAAE;MACT,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CAACjD,cAAc,EAAE+B,cAAc,CAACS,MAAM,EAAEP,UAAU,CACpD,CAAC;EAED,MAAMiB,YAAY,GAAG7D,WAAW,CAC9B,MAAOmC,OAAoB,IAAK;IAC9B,IAAI,CAACxB,cAAc,EAAE;IAErB,IAAI;MACF,MAAMT,SAAS,CAAC4D,QAAQ,CAACnD,cAAc,EAAEwB,OAAO,CAACb,WAAW,CAAC;MAC7DuB,aAAa,CAACV,OAAO,CAACb,WAAW,CAAC;MAClClB,eAAe,CAACc,QAAQ,CAAC,CAAC,CAACS,gBAAgB,CAAC;QAC1CL,WAAW,EAAEa,OAAO,CAACb,WAAW;QAChCO,QAAQ,EAAE,KAAK;QACfwB,cAAc,EAAEU,SAAS;QACzBP,UAAU,EAAEO;MACd,CAAC,CAAC;MACFxD,OAAO,CAACoD,KAAK,CAAC1B,IAAI,CAAC;QACjBC,KAAK,EAAE1B,KAAK,CAAC,4BAA4B,CAAC;QAC1CoD,KAAK,EAAE;MACT,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOZ,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,cAAc,EAAEA,KAAK,CAAC;MACpCzC,OAAO,CAACoD,KAAK,CAAC1B,IAAI,CAAC;QACjBC,KAAK,EAAE1B,KAAK,CAAC,oBAAoB,CAAC;QAClCoD,KAAK,EAAE;MACT,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CAACjD,cAAc,EAAEkC,aAAa,CAChC,CAAC;EAED,OAAO;IACLH,cAAc;IACdQ,UAAU;IACVW;EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAMG,yBAAyB,GAAIrD,cAAsB,IAAK;EACnE,MAAMsD,qBAAqB,GACzB9D,oBAAoB,CAACe,QAAQ,CAAC,CAAC,CAAC+C,qBAAqB;EACvD,IAAItD,cAAc,KAAKsD,qBAAqB,EAAE;EAE9CvD,mBAAmB,CAACC,cAAc,CAAC,CAACoC,KAAK,CAAEC,KAAK,IAAK;IACnDC,OAAO,CAACD,KAAK,CAAC,2BAA2B,EAAEA,KAAK,CAAC;EACnD,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { useCallback } from 'react';
|
|
4
4
|
import { useConversationStore } from "../../store/conversation.js";
|
|
5
|
+
import { useUserStore } from "../../store/user.js";
|
|
5
6
|
import { MessageStatus, MessageType } from '@droppii/openim-rn-client-sdk';
|
|
6
7
|
import { extractUrls } from "../../utils/url.js";
|
|
7
8
|
import OpenIMSDK from '@droppii/openim-rn-client-sdk';
|
|
@@ -30,7 +31,9 @@ export const useSendMessage = () => {
|
|
|
30
31
|
status: MessageStatus.Sending
|
|
31
32
|
});
|
|
32
33
|
try {
|
|
33
|
-
const
|
|
34
|
+
const sendParams = buildSendParams(message, recvID, groupID, extendMessageInfo, plainText);
|
|
35
|
+
console.log('[useSendMessage] dispatchSend params', sendParams);
|
|
36
|
+
const sent = await OpenIMSDK.sendMessage(sendParams);
|
|
34
37
|
deleteOneMessage(message.clientMsgID);
|
|
35
38
|
pushNewMessage(sent);
|
|
36
39
|
} catch {
|
|
@@ -106,7 +109,8 @@ export const useSendMessage = () => {
|
|
|
106
109
|
const params = {
|
|
107
110
|
recvID: recvID || '',
|
|
108
111
|
groupID: groupID || '',
|
|
109
|
-
message
|
|
112
|
+
message,
|
|
113
|
+
offlinePushInfo: generateOfflinePushInfo(message.contentType, '')
|
|
110
114
|
};
|
|
111
115
|
try {
|
|
112
116
|
const sent = isAttachment ? await OpenIMSDK.sendMessageNotOss(params) : await OpenIMSDK.sendMessage(buildSendParams(message, recvID || '', groupID || '', JSON.parse(message.ex || '{}'), ''));
|
|
@@ -137,8 +141,9 @@ export const useSendMessage = () => {
|
|
|
137
141
|
revokeMessage
|
|
138
142
|
};
|
|
139
143
|
};
|
|
140
|
-
const generateOfflinePushInfo = (contentType, plainText) => {
|
|
144
|
+
export const generateOfflinePushInfo = (contentType, plainText) => {
|
|
141
145
|
const conversationData = useConversationStore?.getState?.()?.getCurrentConversation();
|
|
146
|
+
const operatorUserID = useUserStore.getState().user?.userID || '';
|
|
142
147
|
const title = conversationData?.showName || 'Droppii';
|
|
143
148
|
const desc = generateContentBasedOnMessageType(contentType, plainText);
|
|
144
149
|
return {
|
|
@@ -147,6 +152,7 @@ const generateOfflinePushInfo = (contentType, plainText) => {
|
|
|
147
152
|
ex: JSON.stringify({
|
|
148
153
|
icon: conversationData?.faceURL || '',
|
|
149
154
|
conversationId: conversationData?.conversationID || '',
|
|
155
|
+
operatorUserID,
|
|
150
156
|
title,
|
|
151
157
|
desc
|
|
152
158
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useConversationStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","generateContentBasedOnMessageType","markMessageRevoked","useMessageStore","uuid","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","dispatchSend","status","Sending","sent","sendMessage","clientMsgID","Failed","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","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","title","showName","desc","icon","faceURL","conversationId","iOSPushSound","iOSBadgeCount","text","textMessage","v4","then","catch","errCode","errMsg","
|
|
1
|
+
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","generateContentBasedOnMessageType","markMessageRevoked","useMessageStore","uuid","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","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","iOSPushSound","iOSBadgeCount","text","textMessage","v4","then","catch","errCode","errMsg","error","urlTextMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@ import { useMessageStore } from "../store/message.js";
|
|
|
8
8
|
import { useUserStore } from "../store/user.js";
|
|
9
9
|
import { useChatContext } from "../context/index.js";
|
|
10
10
|
import { allSettled } from "../utils/promise.js";
|
|
11
|
+
import { useSetIsShowFLashMessage } from "../context/global.js";
|
|
11
12
|
export function useChatMessages({
|
|
12
13
|
conversationId,
|
|
13
14
|
enabled = true,
|
|
@@ -30,6 +31,7 @@ export function useChatMessages({
|
|
|
30
31
|
const [error, setError] = useState(null);
|
|
31
32
|
const conversationIdRef = useRef(conversationId);
|
|
32
33
|
conversationIdRef.current = conversationId;
|
|
34
|
+
const setIsShowFlashMessage = useSetIsShowFLashMessage();
|
|
33
35
|
const fetchInitial = useCallback(async () => {
|
|
34
36
|
if (!conversationId) return;
|
|
35
37
|
setIsLoading(true);
|
|
@@ -128,12 +130,14 @@ export function useChatMessages({
|
|
|
128
130
|
}, [conversationId, enabled, fetchInitial, reset]);
|
|
129
131
|
useEffect(() => {
|
|
130
132
|
if (!enabled || !conversationId) return;
|
|
133
|
+
setIsShowFlashMessage(false);
|
|
131
134
|
const handleNewMessages = incoming => appendIncomingMessages(incoming);
|
|
132
135
|
OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
|
|
133
136
|
return () => {
|
|
137
|
+
setIsShowFlashMessage(true);
|
|
134
138
|
OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
|
|
135
139
|
};
|
|
136
|
-
}, [appendIncomingMessages, conversationId, enabled]);
|
|
140
|
+
}, [appendIncomingMessages, conversationId, enabled, setIsShowFlashMessage]);
|
|
137
141
|
return {
|
|
138
142
|
messages,
|
|
139
143
|
currentUserId,
|