Page MenuHomePhabricator
Differential D13388

[lib] avoid creating `notificationsCreationData` on `DMOperation` received from other peer
ClosedPublic
Actions

Authored by kamil on Sep 19 2024, 6:14 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 10, 10:38 AM
Unknown Object (File)
Fri, Feb 28, 9:38 AM
Unknown Object (File)
Fri, Feb 28, 9:37 AM
Unknown Object (File)
Fri, Feb 28, 12:21 AM
Unknown Object (File)
Fri, Feb 28, 12:21 AM
Unknown Object (File)
Wed, Feb 26, 12:35 AM
Unknown Object (File)
Feb 6 2025, 10:39 AM
Unknown Object (File)
Feb 6 2025, 5:23 AM
View All 70 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMM2b686b3c4b7b: [lib] avoid creating `notificationsCreationData` on `DMOperation` received from…
Summary

Looks like we're generating notificationsCreationData even when DMOperation was received, later on this is discarded, but we can avoid generating data that is dropped.

Test Plan
  1. No data generated when DMOperation is received.
  2. Notifs works

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
shared/
dm-ops/
23 lines

Diff 44392

View Options

lib/shared/dm-ops/process-dm-ops.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _groupBy from 'lodash/fp/groupBy.js'; import _groupBy from 'lodash/fp/groupBy.js';
import _keyBy from 'lodash/fp/keyBy.js'; import _keyBy from 'lodash/fp/keyBy.js';
import _omit from 'lodash/fp/omit.js'; import _omit from 'lodash/fp/omit.js';
import _partition from 'lodash/fp/partition.js'; import _partition from 'lodash/fp/partition.js';
import _sortBy from 'lodash/fp/sortBy.js'; import _sortBy from 'lodash/fp/sortBy.js';
import _memoize from 'lodash/memoize.js'; import _memoize from 'lodash/memoize.js';
import * as React from 'react'; import * as React from 'react';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import uuid from 'uuid';
import type { import type {
LegacySendMultimediaMessageInput, LegacySendMultimediaMessageInput,
SendTextMessageInput, SendTextMessageInput,
} from 'lib/actions/message-actions.js'; } from 'lib/actions/message-actions.js';
import { import {
createLocalMessageActionType, createLocalMessageActionType,
sendMultimediaMessageActionTypes, sendMultimediaMessageActionTypes,
Show All 17 Linesimport {
type PushModal, type PushModal,
useModalContext, useModalContext,
} from 'lib/components/modal-provider.react.js'; } from 'lib/components/modal-provider.react.js';
import blobService from 'lib/facts/blob-service.js'; import blobService from 'lib/facts/blob-service.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { useLegacyAshoatKeyserverCall } from 'lib/keyserver-conn/legacy-keyserver-call.js'; import { useLegacyAshoatKeyserverCall } from 'lib/keyserver-conn/legacy-keyserver-call.js';
import { getNextLocalUploadID } from 'lib/media/media-utils.js'; import { getNextLocalUploadID } from 'lib/media/media-utils.js';
import { pendingToRealizedThreadIDsSelector } from 'lib/selectors/thread-selectors.js'; import { pendingToRealizedThreadIDsSelector } from 'lib/selectors/thread-selectors.js';
import {
dmOperationSpecificationTypes,
type OutboundDMOperationSpecification,
} from 'lib/shared/dm-ops/dm-op-utils.js';
import { useProcessAndSendDMOperation } from 'lib/shared/dm-ops/process-dm-ops.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import type { IdentityClientContextType } from 'lib/shared/identity-client-context.js'; import type { IdentityClientContextType } from 'lib/shared/identity-client-context.js';
import { import {
createMediaMessageInfo, createMediaMessageInfo,
localIDPrefix, localIDPrefix,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
Show All 22 Linesimport {
type SendMessageResult, type SendMessageResult,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import type { RawImagesMessageInfo } from 'lib/types/messages/images.js'; import type { RawImagesMessageInfo } from 'lib/types/messages/images.js';
import type { RawMediaMessageInfo } from 'lib/types/messages/media.js'; import type { RawMediaMessageInfo } from 'lib/types/messages/media.js';
import type { RawTextMessageInfo } from 'lib/types/messages/text.js'; import type { RawTextMessageInfo } from 'lib/types/messages/text.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import type { Dispatch } from 'lib/types/redux-types.js'; import type { Dispatch } from 'lib/types/redux-types.js';
import { reportTypes } from 'lib/types/report-types.js'; import { reportTypes } from 'lib/types/report-types.js';
import { threadTypeIsSidebar } from 'lib/types/thread-types-enum.js'; import {
threadTypeIsSidebar,
threadTypeIsThick,
} from 'lib/types/thread-types-enum.js';
import { import {
type ClientNewThinThreadRequest, type ClientNewThinThreadRequest,
type NewThreadResult, type NewThreadResult,
} from 'lib/types/thread-types.js'; } from 'lib/types/thread-types.js';
import { import {
blobHashFromBlobServiceURI, blobHashFromBlobServiceURI,
isBlobServiceURI, isBlobServiceURI,
makeBlobServiceEndpointURL, makeBlobServiceEndpointURL,
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines +uploadMultimedia: (
callbacks: MultimediaUploadCallbacks, callbacks: MultimediaUploadCallbacks,
) => Promise<UploadMultimediaResult>, ) => Promise<UploadMultimediaResult>,
+blobServiceUpload: BlobServiceUploadAction, +blobServiceUpload: BlobServiceUploadAction,
+deleteUpload: (input: DeleteUploadInput) => Promise<void>, +deleteUpload: (input: DeleteUploadInput) => Promise<void>,
+sendMultimediaMessage: ( +sendMultimediaMessage: (
input: LegacySendMultimediaMessageInput, input: LegacySendMultimediaMessageInput,
) => Promise<SendMessageResult>, ) => Promise<SendMessageResult>,
+sendTextMessage: (input: SendTextMessageInput) => Promise<SendMessageResult>, +sendTextMessage: (input: SendTextMessageInput) => Promise<SendMessageResult>,
+processAndSendDMOperation: (
dmOperationSpecification: OutboundDMOperationSpecification,
) => Promise<void>,
+newThinThread: ( +newThinThread: (
request: ClientNewThinThreadRequest, request: ClientNewThinThreadRequest,
) => Promise<NewThreadResult>, ) => Promise<NewThreadResult>,
+pushModal: PushModal, +pushModal: PushModal,
+sendCallbacks: $ReadOnlyArray<() => mixed>, +sendCallbacks: $ReadOnlyArray<() => mixed>,
+registerSendCallback: (() => mixed) => void, +registerSendCallback: (() => mixed) => void,
+unregisterSendCallback: (() => mixed) => void, +unregisterSendCallback: (() => mixed) => void,
+textMessageCreationSideEffectsFunc: CreationSideEffectsFunc<RawTextMessageInfo>, +textMessageCreationSideEffectsFunc: CreationSideEffectsFunc<RawTextMessageInfo>,
▲ Show 20 Lines • Show All 1,103 Lines • ▼ Show 20 Lines
async sendTextMessage( async sendTextMessage(
messageInfo: RawTextMessageInfo, messageInfo: RawTextMessageInfo,
inputThreadInfo: ThreadInfo, inputThreadInfo: ThreadInfo,
parentThreadInfo: ?ThreadInfo, parentThreadInfo: ?ThreadInfo,
) { ) {
this.props.sendCallbacks.forEach(callback => callback()); this.props.sendCallbacks.forEach(callback => callback());
// TODO: this should be update according to thread creation logic
// (ENG-8567)
if (threadTypeIsThick(inputThreadInfo.type)) {
const recipientIDs = inputThreadInfo.members.map(member => member.id);
void this.props.processAndSendDMOperation({
type: dmOperationSpecificationTypes.OUTBOUND,
op: {
type: 'send_text_message',
threadID: inputThreadInfo.id,
creatorID: messageInfo.creatorID,
time: Date.now(),
messageID: uuid.v4(),
text: messageInfo.text,
},
recipients: {
type: 'some_users',
userIDs: recipientIDs,
},
});
return;
}
const { localID } = messageInfo; const { localID } = messageInfo;
invariant( invariant(
localID !== null && localID !== undefined, localID !== null && localID !== undefined,
'localID should be set', 'localID should be set',
); );
if (threadIsPendingSidebar(inputThreadInfo.id)) { if (threadIsPendingSidebar(inputThreadInfo.id)) {
this.pendingSidebarCreationMessageLocalIDs.add(localID); this.pendingSidebarCreationMessageLocalIDs.add(localID);
} }
▲ Show 20 Lines • Show All 394 Lines • ▼ Show 20 Lines React.memo<BaseProps>(function ConnectedInputStateContainer(props) {
const callDeleteUpload = useDeleteUpload(); const callDeleteUpload = useDeleteUpload();
const callSendMultimediaMessage = useLegacySendMultimediaMessage(); const callSendMultimediaMessage = useLegacySendMultimediaMessage();
const callSendTextMessage = useSendTextMessage(); const callSendTextMessage = useSendTextMessage();
const callNewThinThread = useNewThinThread(); const callNewThinThread = useNewThinThread();
const dispatch = useDispatch(); const dispatch = useDispatch();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const modalContext = useModalContext(); const modalContext = useModalContext();
const identityContext = React.useContext(IdentityClientContext); const identityContext = React.useContext(IdentityClientContext);
const processAndSendDMOperation = useProcessAndSendDMOperation();
const [sendCallbacks, setSendCallbacks] = React.useState< const [sendCallbacks, setSendCallbacks] = React.useState<
$ReadOnlyArray<() => mixed>, $ReadOnlyArray<() => mixed>,
>([]); >([]);
const registerSendCallback = React.useCallback((callback: () => mixed) => { const registerSendCallback = React.useCallback((callback: () => mixed) => {
setSendCallbacks(prevCallbacks => [...prevCallbacks, callback]); setSendCallbacks(prevCallbacks => [...prevCallbacks, callback]);
}, []); }, []);
const unregisterSendCallback = React.useCallback( const unregisterSendCallback = React.useCallback(
Show All 16 Lines return (
messageStoreMessages={messageStoreMessages} messageStoreMessages={messageStoreMessages}
pendingRealizedThreadIDs={pendingToRealizedThreadIDs} pendingRealizedThreadIDs={pendingToRealizedThreadIDs}
calendarQuery={calendarQuery} calendarQuery={calendarQuery}
uploadMultimedia={callUploadMultimedia} uploadMultimedia={callUploadMultimedia}
blobServiceUpload={callBlobServiceUpload} blobServiceUpload={callBlobServiceUpload}
deleteUpload={callDeleteUpload} deleteUpload={callDeleteUpload}
sendMultimediaMessage={callSendMultimediaMessage} sendMultimediaMessage={callSendMultimediaMessage}
sendTextMessage={callSendTextMessage} sendTextMessage={callSendTextMessage}
processAndSendDMOperation={processAndSendDMOperation}
newThinThread={callNewThinThread} newThinThread={callNewThinThread}
dispatch={dispatch} dispatch={dispatch}
dispatchActionPromise={dispatchActionPromise} dispatchActionPromise={dispatchActionPromise}
pushModal={modalContext.pushModal} pushModal={modalContext.pushModal}
sendCallbacks={sendCallbacks} sendCallbacks={sendCallbacks}
registerSendCallback={registerSendCallback} registerSendCallback={registerSendCallback}
unregisterSendCallback={unregisterSendCallback} unregisterSendCallback={unregisterSendCallback}
textMessageCreationSideEffectsFunc={textMessageCreationSideEffectsFunc} textMessageCreationSideEffectsFunc={textMessageCreationSideEffectsFunc}
identityContext={identityContext} identityContext={identityContext}
/> />
); );
}); });
export default ConnectedInputStateContainer; export default ConnectedInputStateContainer;