Page MenuHomePhabricator
Files F3398608

D9545.id32273.diff
No OneTemporary
Actions

D9545.id32273.diff
View Options

diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js
--- a/web/chat/chat-input-bar.react.js
+++ b/web/chat/chat-input-bar.react.js
@@ -528,9 +528,10 @@
onMultimediaFileChange = async (
event: SyntheticInputEvent<HTMLInputElement>,
) => {
- const result = await this.props.inputState.appendFiles([
- ...event.target.files,
- ]);
+ const result = await this.props.inputState.appendFiles(
+ this.props.threadInfo,
+ [...event.target.files],
+ );
if (!result && this.multimediaInput) {
this.multimediaInput.value = '';
}
diff --git a/web/chat/chat-message-list-container.react.js b/web/chat/chat-message-list-container.react.js
--- a/web/chat/chat-message-list-container.react.js
+++ b/web/chat/chat-message-list-container.react.js
@@ -36,11 +36,11 @@
const dispatch = useDispatch();
React.useEffect(() => {
- if (isChatCreation && activeChatThreadID !== threadInfo?.id) {
+ if (isChatCreation && activeChatThreadID !== threadInfo.id) {
let payload = {
- activeChatThreadID: threadInfo?.id,
+ activeChatThreadID: threadInfo.id,
};
- if (threadIsPending(threadInfo?.id)) {
+ if (threadIsPending(threadInfo.id)) {
payload = {
...payload,
pendingThread: threadInfo,
@@ -60,7 +60,7 @@
drop: item => {
const { files } = item;
if (inputState && files.length > 0) {
- inputState.appendFiles(files);
+ inputState.appendFiles(threadInfo, files);
}
},
collect: monitor => ({
@@ -91,9 +91,9 @@
return;
}
e.preventDefault();
- inputState.appendFiles([...files]);
+ inputState.appendFiles(threadInfo, [...files]);
},
- [inputState],
+ [inputState, threadInfo],
);
React.useEffect(() => {
diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js
--- a/web/input/input-state-container.react.js
+++ b/web/input/input-state-container.react.js
@@ -78,7 +78,6 @@
type ClientNewThreadRequest,
type NewThreadResult,
type ThreadInfo,
- type RawThreadInfo,
} from 'lib/types/thread-types.js';
import {
type DispatchActionPromise,
@@ -120,7 +119,6 @@
+drafts: { +[key: string]: string },
+viewerID: ?string,
+messageStoreMessages: { +[id: string]: RawMessageInfo },
- +threadStoreThreadInfos: { +[id: string]: RawThreadInfo },
+pendingRealizedThreadIDs: $ReadOnlyMap<string, string>,
+dispatch: Dispatch,
+dispatchActionPromise: DispatchActionPromise,
@@ -292,18 +290,26 @@
) {
continue;
}
+ const { shouldEncrypt } = upload;
let assignedUploads = newlyAssignedUploads.get(messageID);
if (!assignedUploads) {
- assignedUploads = { threadID, uploads: [] };
+ assignedUploads = { threadID, shouldEncrypt, uploads: [] };
newlyAssignedUploads.set(messageID, assignedUploads);
}
+ if (shouldEncrypt !== assignedUploads.shouldEncrypt) {
+ console.warn(
+ `skipping upload ${localUploadID} ` +
+ "because shouldEncrypt doesn't match",
+ );
+ continue;
+ }
assignedUploads.uploads.push(upload);
}
}
const newMessageInfos = new Map();
for (const [messageID, assignedUploads] of newlyAssignedUploads) {
- const { uploads, threadID } = assignedUploads;
+ const { uploads, threadID, shouldEncrypt } = assignedUploads;
const creatorID = this.props.viewerID;
invariant(creatorID, 'need viewer ID in order to send a message');
const media = uploads.map(
@@ -358,7 +364,7 @@
creatorID,
media,
},
- { forceMultimediaMessageType: this.shouldEncryptMedia(threadID) },
+ { forceMultimediaMessageType: shouldEncrypt },
);
newMessageInfos.set(messageID, messageInfo);
}
@@ -402,11 +408,7 @@
return rawMessageInfo;
}
- shouldEncryptMedia(threadID: ?string): boolean {
- if (!threadID) {
- return false;
- }
- const threadInfo = this.props.threadStoreThreadInfos[threadID];
+ shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return threadInfoInsideCommunity(threadInfo, commStaffCommunity.id);
}
@@ -602,8 +604,8 @@
assignedUploads,
draft: draft ?? '',
textCursorPosition: textCursorPosition ?? 0,
- appendFiles: (files: $ReadOnlyArray<File>) =>
- this.appendFiles(threadID, files),
+ appendFiles: (threadInfo: ThreadInfo, files: $ReadOnlyArray<File>) =>
+ this.appendFiles(threadInfo, files),
cancelPendingUpload: (localUploadID: string) =>
this.cancelPendingUpload(threadID, localUploadID),
sendTextMessage: (
@@ -659,16 +661,14 @@
}
async appendFiles(
- threadID: ?string,
+ threadInfo: ThreadInfo,
files: $ReadOnlyArray<File>,
): Promise<boolean> {
- invariant(threadID, 'threadID should be set in appendFiles');
-
const selectionTime = Date.now();
const { pushModal } = this.props;
const appendResults = await Promise.all(
- files.map(file => this.appendFile(threadID, file, selectionTime)),
+ files.map(file => this.appendFile(threadInfo, file, selectionTime)),
);
if (appendResults.some(({ result }) => !result.success)) {
@@ -700,7 +700,7 @@
const newUploadsObject = _keyBy('localID')(newUploads);
this.setState(
prevState => {
- const newThreadID = this.getRealizedOrPendingThreadID(threadID);
+ const newThreadID = this.getRealizedOrPendingThreadID(threadInfo.id);
const prevUploads = prevState.pendingUploads[newThreadID];
const mergedUploads = prevUploads
? { ...prevUploads, ...newUploadsObject }
@@ -712,13 +712,13 @@
},
};
},
- () => this.uploadFiles(threadID, newUploads),
+ () => this.uploadFiles(threadInfo.id, newUploads),
);
return true;
}
async appendFile(
- threadID: ?string,
+ threadInfo: ThreadInfo,
file: File,
selectTime: number,
): Promise<{
@@ -759,8 +759,10 @@
}
const { uri, file: fixedFile, mediaType, dimensions } = result;
+ const shouldEncrypt = this.shouldEncryptMedia(threadInfo);
+
let encryptionResult;
- if (this.shouldEncryptMedia(threadID)) {
+ if (shouldEncrypt) {
let encryptionResponse;
const encryptionStart = Date.now();
try {
@@ -813,6 +815,7 @@
abort: null,
steps,
selectTime,
+ shouldEncrypt,
},
},
};
@@ -1607,9 +1610,6 @@
const messageStoreMessages = useSelector(
state => state.messageStore.messages,
);
- const threadStoreThreadInfos = useSelector(
- state => state.threadStore.threadInfos,
- );
const pendingToRealizedThreadIDs = useSelector(state =>
pendingToRealizedThreadIDsSelector(state.threadStore.threadInfos),
);
@@ -1651,7 +1651,6 @@
drafts={drafts}
viewerID={viewerID}
messageStoreMessages={messageStoreMessages}
- threadStoreThreadInfos={threadStoreThreadInfos}
pendingRealizedThreadIDs={pendingToRealizedThreadIDs}
calendarQuery={calendarQuery}
uploadMultimedia={callUploadMultimedia}
diff --git a/web/input/input-state.js b/web/input/input-state.js
--- a/web/input/input-state.js
+++ b/web/input/input-state.js
@@ -41,6 +41,7 @@
+abort: ?() => void,
+steps: MediaMissionStep[],
+selectTime: number,
+ +shouldEncrypt: boolean,
};
export type TypeaheadState = {
@@ -63,7 +64,10 @@
+draft: string,
+textCursorPosition: number,
+typeaheadState: TypeaheadState,
- +appendFiles: (files: $ReadOnlyArray<File>) => Promise<boolean>,
+ +appendFiles: (
+ threadInfo: ThreadInfo,
+ files: $ReadOnlyArray<File>,
+ ) => Promise<boolean>,
+cancelPendingUpload: (localUploadID: string) => void,
+sendTextMessage: (
messageInfo: RawTextMessageInfo,

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 2, 11:37 PM (21 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2608931
Default Alt Text
D9545.id32273.diff (7 KB)

Event Timeline