Page MenuHomePhabricator
Files F3521162

D13327.id44140.diff
No OneTemporary
Actions

D13327.id44140.diff
View Options

diff --git a/lib/shared/dm-ops/dm-op-utils.js b/lib/shared/dm-ops/dm-op-utils.js
--- a/lib/shared/dm-ops/dm-op-utils.js
+++ b/lib/shared/dm-ops/dm-op-utils.js
@@ -106,7 +106,8 @@
| InboundDMOperationSpecification;
async function createMessagesToPeersFromDMOp(
- operation: OutboundDMOperationSpecification,
+ operation: DMOperation,
+ recipients: OutboundDMOperationSpecificationRecipients,
allPeerUserIDAndDeviceIDs: $ReadOnlyArray<{
+userID: string,
+deviceID: string,
@@ -119,17 +120,17 @@
}
let peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs;
- if (operation.recipients.type === 'self_devices') {
+ if (recipients.type === 'self_devices') {
peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(
peer => peer.userID === currentUserInfo.id,
);
- } else if (operation.recipients.type === 'some_users') {
- const userIDs = new Set(operation.recipients.userIDs);
+ } else if (recipients.type === 'some_users') {
+ const userIDs = new Set(recipients.userIDs);
peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
userIDs.has(peer.userID),
);
- } else if (operation.recipients.type === 'all_thread_members') {
- const members = threadInfos[operation.recipients.threadID]?.members ?? [];
+ } else if (recipients.type === 'all_thread_members') {
+ const members = threadInfos[recipients.threadID]?.members ?? [];
const memberIDs = members.map(member => member.id);
const userIDs = new Set(memberIDs);
@@ -142,7 +143,7 @@
const targetPeers = peerUserIDAndDeviceIDs.filter(
peer => peer.deviceID !== thisDeviceID,
);
- return generateMessagesToPeers(operation.op, targetPeers);
+ return generateMessagesToPeers(operation, targetPeers);
}
function getCreateThickRawThreadInfoInputFromThreadInfo(
diff --git a/lib/shared/dm-ops/process-dm-ops.js b/lib/shared/dm-ops/process-dm-ops.js
--- a/lib/shared/dm-ops/process-dm-ops.js
+++ b/lib/shared/dm-ops/process-dm-ops.js
@@ -6,13 +6,12 @@
import uuid from 'uuid';
import { dmOpSpecs } from './dm-op-specs.js';
-import type {
- OutboundDMOperationSpecification,
- DMOperationSpecification,
-} from './dm-op-utils.js';
import {
+ type OutboundDMOperationSpecification,
+ type DMOperationSpecification,
createMessagesToPeersFromDMOp,
dmOperationSpecificationTypes,
+ type OutboundComposableDMOperationSpecification,
} from './dm-op-utils.js';
import { processNewUserIDsActionType } from '../../actions/user-actions.js';
import { useLoggedInUserInfo } from '../../hooks/account-hooks.js';
@@ -80,7 +79,8 @@
dmOperationSpecification.type === dmOperationSpecificationTypes.OUTBOUND
) {
outboundP2PMessages = await createMessagesToPeersFromDMOp(
- dmOperationSpecification,
+ dmOp,
+ dmOperationSpecification.recipients,
allPeerUserIDAndDeviceIDs,
currentUserInfo,
threadInfos,
@@ -374,8 +374,76 @@
);
}
+function useSendComposableDMOperation(): (
+ dmOperationSpecification: OutboundComposableDMOperationSpecification,
+) => Promise<$ReadOnlyArray<string>> {
+ const fetchMessage = useGetLatestMessageEdit();
+ const threadInfos = useSelector(state => state.threadStore.threadInfos);
+ const { getDMOpsSendingPromise } = usePeerToPeerCommunication();
+ const dispatchWithMetadata = useDispatchWithMetadata();
+ const allPeerUserIDAndDeviceIDs = useSelector(getAllPeerUserIDAndDeviceIDs);
+ const currentUserInfo = useSelector(state => state.currentUserInfo);
+
+ const utilities = React.useMemo(
+ () => ({
+ fetchMessage,
+ threadInfos,
+ }),
+ [fetchMessage, threadInfos],
+ );
+
+ return React.useCallback(
+ async (
+ dmOperationSpecification: OutboundComposableDMOperationSpecification,
+ ): Promise<$ReadOnlyArray<string>> => {
+ const { promise, dmOpID } = getDMOpsSendingPromise();
+
+ const { op, composableMessageID, recipients } = dmOperationSpecification;
+
+ const outboundP2PMessages = await createMessagesToPeersFromDMOp(
+ op,
+ recipients,
+ allPeerUserIDAndDeviceIDs,
+ currentUserInfo,
+ threadInfos,
+ );
+
+ const notificationsCreationData = await dmOpSpecs[
+ op.type
+ ].notificationsCreationData?.(op, utilities);
+
+ dispatchWithMetadata(
+ {
+ type: processDMOpsActionType,
+ payload: {
+ rawMessageInfos: [],
+ updateInfos: [],
+ outboundP2PMessages,
+ composableMessageID,
+ notificationsCreationData,
+ },
+ },
+ {
+ dmOpID,
+ },
+ );
+
+ return promise;
+ },
+ [
+ allPeerUserIDAndDeviceIDs,
+ currentUserInfo,
+ dispatchWithMetadata,
+ getDMOpsSendingPromise,
+ threadInfos,
+ utilities,
+ ],
+ );
+}
+
export {
useProcessDMOperation,
useProcessAndSendDMOperation,
useRetrySendDMOperation,
+ useSendComposableDMOperation,
};

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 2:30 AM (19 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2697966
Default Alt Text
D13327.id44140.diff (4 KB)

Event Timeline