Page MenuHomePhabricator
Differential D11650

[lib] Split `UpdateRelationshipMessageInfo` into `Update[Traditional/Farcaster]RelationshipMessageInfo`
ClosedPublic
Actions

Authored by atul on Apr 12 2024, 11:47 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 5:44 PM
Unknown Object (File)
Wed, Apr 16, 2:34 PM
Unknown Object (File)
Wed, Apr 16, 11:16 AM
Unknown Object (File)
Wed, Apr 16, 10:28 AM
Unknown Object (File)
Tue, Apr 15, 6:33 AM
Unknown Object (File)
Wed, Apr 9, 11:26 AM
Unknown Object (File)
Wed, Mar 26, 4:41 PM
Unknown Object (File)
Tue, Mar 25, 12:31 AM
View All 72 Files
Subscribers
ashoat

Details

Reviewers
ginsu
tomek
varun
will
Commits
rCOMM7996b0306372: [lib] Split `UpdateRelationshipMessageInfo` into `Update…
Summary

Similar to previous diffs in stack, splitting the type to support farcaster operation.

Made necessary changes to update-relationship-message-spec as well.

Depends on D11642

Test Plan

Flow for now, will be tested implicitly by subsequent diffs where these messages are actually created/persisted/etc.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Apr 12 2024, 11:47 AM
Herald added a subscriber: ashoat. · View Herald TranscriptApr 12 2024, 11:47 AM
Harbormaster completed remote builds in B28196: Diff 39086.Apr 12 2024, 12:03 PM
atul requested review of this revision.Apr 12 2024, 12:03 PM
tomek accepted this revision.Apr 15 2024, 1:24 AM
tomek added inline comments.
lib/shared/messages/update-relationship-message-spec.js
155 ↗(On Diff #39086)

Is there a const we can use here?

219 ↗(On Diff #39086)

We probably have to introduce a shim for this new operation type

This revision is now accepted and ready to land.Apr 15 2024, 1:24 AM
atul added a child revision: D11651: [lib] Include `[creator/target]FID` in `messageContentForServerDB` when update relationship op is `farcaster_mutual`.Apr 16 2024, 12:22 PM
atul added inline comments.Apr 18 2024, 11:05 AM
lib/shared/messages/update-relationship-message-spec.js
155 ↗(On Diff #39086)

There's not at the moment, have a diff locally where I replace this with a constant value.

Definitely agree that hardcoding this string is not ideal and error-prone.

atul added inline comments.Apr 18 2024, 11:07 AM
lib/shared/messages/update-relationship-message-spec.js
219 ↗(On Diff #39086)

We send UNSUPPORTED message for farcaster_mutual operation:

158a3d.png (704×876 px, 112 KB)

atul attached a referenced file: F1572505: 158a3d.png. (Show Details)Apr 18 2024, 11:39 AM
atul updated this revision to Diff 39234.Apr 18 2024, 11:43 AM

rebase and aldn

This revision was landed with ongoing or failed builds.Apr 18 2024, 11:48 AM
Closed by commit rCOMM7996b0306372: [lib] Split `UpdateRelationshipMessageInfo` into `Update… (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM7996b0306372: [lib] Split `UpdateRelationshipMessageInfo` into `Update….
Harbormaster completed remote builds in B28298: Diff 39234.Apr 18 2024, 11:59 AM

Revision Contents
Changeset List

PathSize
lib/
shared/
messages/
12 lines
types/
messages/
20 lines

Diff 39235

View Options

lib/shared/messages/update-relationship-message-spec.js

Show First 20 Lines • Show All 268 Lines • ▼ Show 20 Linesclass InputStateContainer extends React.PureComponent<Props, State> {
} }
static completedMessageIDs(state: State): Set<string> { static completedMessageIDs(state: State): Set<string> {
const completed = new Map<string, boolean>(); const completed = new Map<string, boolean>();
for (const threadID in state.pendingUploads) { for (const threadID in state.pendingUploads) {
const pendingUploads = state.pendingUploads[threadID]; const pendingUploads = state.pendingUploads[threadID];
for (const localUploadID in pendingUploads) { for (const localUploadID in pendingUploads) {
const upload = pendingUploads[localUploadID]; const upload = pendingUploads[localUploadID];
const { messageID, serverID, failed } = upload; const { messageID, canBeSent, failed } = upload;
if (!messageID || !messageID.startsWith(localIDPrefix)) { if (!messageID || !messageID.startsWith(localIDPrefix)) {
continue; continue;
} }
if (!serverID || failed) { if (!canBeSent || failed) {
completed.set(messageID, false); completed.set(messageID, false);
continue; continue;
} }
if (completed.get(messageID) === undefined) { if (completed.get(messageID) === undefined) {
completed.set(messageID, true); completed.set(messageID, true);
} }
} }
} }
▲ Show 20 Lines • Show All 569 Lines • ▼ Show 20 Lines return {
messageID: null, messageID: null,
failed: false, failed: false,
file: encryptionResult?.file ?? fixedFile, file: encryptionResult?.file ?? fixedFile,
mediaType: encryptionResult ? 'encrypted_photo' : mediaType, mediaType: encryptionResult ? 'encrypted_photo' : mediaType,
dimensions, dimensions,
uri: encryptionResult?.uri ?? uri, uri: encryptionResult?.uri ?? uri,
loop: false, loop: false,
uriIsReal: false, uriIsReal: false,
canBeSent: false,
blobHolder: null, blobHolder: null,
blobHash: encryptionResult?.sha256Hash, blobHash: encryptionResult?.sha256Hash,
encryptionKey: encryptionResult?.encryptionKey, encryptionKey: encryptionResult?.encryptionKey,
thumbHash, thumbHash,
progressPercent: 0, progressPercent: 0,
abort: null, abort: null,
steps, steps,
selectTime, selectTime,
Show All 10 Lines ): Promise<mixed> {
return Promise.all( return Promise.all(
uploads.map(upload => this.uploadFile(threadInfo, upload)), uploads.map(upload => this.uploadFile(threadInfo, upload)),
); );
} }
async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) { async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) {
const { selectTime, localID, encryptionKey } = upload; const { selectTime, localID, encryptionKey } = upload;
const threadID = threadInfo.id; const threadID = threadInfo.id;
const isThickThread = threadTypeIsThick(threadInfo.type);
const isEncrypted = const isEncrypted =
!!encryptionKey && !!encryptionKey &&
(upload.mediaType === 'encrypted_photo' || (upload.mediaType === 'encrypted_photo' ||
upload.mediaType === 'encrypted_video'); upload.mediaType === 'encrypted_video');
const steps = [...upload.steps]; const steps = [...upload.steps];
let userTime; let userTime;
Show All 25 Lines async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) {
const uploadStart = Date.now(); const uploadStart = Date.now();
try { try {
const callbacks = { const callbacks = {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress(threadID, localID, percent), this.setProgress(threadID, localID, percent),
abortHandler: (abort: () => void) => abortHandler: (abort: () => void) =>
this.handleAbortCallback(threadID, localID, abort), this.handleAbortCallback(threadID, localID, abort),
}; };
const isThickThread = threadTypeIsThick(threadInfo.type);
const useBlobService = isThickThread || this.useBlobServiceUploads; const useBlobService = isThickThread || this.useBlobServiceUploads;
if ( if (
useBlobService && useBlobService &&
(upload.mediaType === 'encrypted_photo' || (upload.mediaType === 'encrypted_photo' ||
upload.mediaType === 'encrypted_video') upload.mediaType === 'encrypted_video')
) { ) {
const { blobHash, dimensions, thumbHash } = upload; const { blobHash, dimensions, thumbHash } = upload;
invariant( invariant(
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Lines this.setState(prevState => {
...prevState.pendingUploads, ...prevState.pendingUploads,
[newThreadID]: { [newThreadID]: {
...uploads, ...uploads,
[localID]: { [localID]: {
...currentUpload, ...currentUpload,
serverID: result.id, serverID: result.id,
blobHolder: result.blobHolder, blobHolder: result.blobHolder,
abort: null, abort: null,
// For thin threads we can send message right after serverID
// is present, but for thick threads we need to wait until
// a "real" Blob URI is assigned to the message.
canBeSent: !isThickThread,
}, },
}, },
}, },
}; };
}); });
if (encryptionKey) { if (encryptionKey) {
const authMetadata = await identityContext.getAuthMetadata(); const authMetadata = await identityContext.getAuthMetadata();
▲ Show 20 Lines • Show All 71 Lines • ▼ Show 20 Lines this.setState(prevState => {
...prevState.pendingUploads, ...prevState.pendingUploads,
[newThreadID]: { [newThreadID]: {
...uploads, ...uploads,
[localID]: { [localID]: {
...currentUpload, ...currentUpload,
uri: result.uri, uri: result.uri,
mediaType: outputMediaType, mediaType: outputMediaType,
dimensions: result.dimensions, dimensions: result.dimensions,
uriIsReal: true,
loop: result.loop, loop: result.loop,
uriIsReal: true,
canBeSent: true,
}, },
}, },
}, },
}; };
}); });
} }
handleAbortCallback( handleAbortCallback(
▲ Show 20 Lines • Show All 624 Lines • Show Last 20 Lines
View Options

lib/types/messages/update-relationship.js

Show First 20 Lines • Show All 268 Lines • ▼ Show 20 Linesclass InputStateContainer extends React.PureComponent<Props, State> {
} }
static completedMessageIDs(state: State): Set<string> { static completedMessageIDs(state: State): Set<string> {
const completed = new Map<string, boolean>(); const completed = new Map<string, boolean>();
for (const threadID in state.pendingUploads) { for (const threadID in state.pendingUploads) {
const pendingUploads = state.pendingUploads[threadID]; const pendingUploads = state.pendingUploads[threadID];
for (const localUploadID in pendingUploads) { for (const localUploadID in pendingUploads) {
const upload = pendingUploads[localUploadID]; const upload = pendingUploads[localUploadID];
const { messageID, serverID, failed } = upload; const { messageID, canBeSent, failed } = upload;
if (!messageID || !messageID.startsWith(localIDPrefix)) { if (!messageID || !messageID.startsWith(localIDPrefix)) {
continue; continue;
} }
if (!serverID || failed) { if (!canBeSent || failed) {
completed.set(messageID, false); completed.set(messageID, false);
continue; continue;
} }
if (completed.get(messageID) === undefined) { if (completed.get(messageID) === undefined) {
completed.set(messageID, true); completed.set(messageID, true);
} }
} }
} }
▲ Show 20 Lines • Show All 569 Lines • ▼ Show 20 Lines return {
messageID: null, messageID: null,
failed: false, failed: false,
file: encryptionResult?.file ?? fixedFile, file: encryptionResult?.file ?? fixedFile,
mediaType: encryptionResult ? 'encrypted_photo' : mediaType, mediaType: encryptionResult ? 'encrypted_photo' : mediaType,
dimensions, dimensions,
uri: encryptionResult?.uri ?? uri, uri: encryptionResult?.uri ?? uri,
loop: false, loop: false,
uriIsReal: false, uriIsReal: false,
canBeSent: false,
blobHolder: null, blobHolder: null,
blobHash: encryptionResult?.sha256Hash, blobHash: encryptionResult?.sha256Hash,
encryptionKey: encryptionResult?.encryptionKey, encryptionKey: encryptionResult?.encryptionKey,
thumbHash, thumbHash,
progressPercent: 0, progressPercent: 0,
abort: null, abort: null,
steps, steps,
selectTime, selectTime,
Show All 10 Lines ): Promise<mixed> {
return Promise.all( return Promise.all(
uploads.map(upload => this.uploadFile(threadInfo, upload)), uploads.map(upload => this.uploadFile(threadInfo, upload)),
); );
} }
async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) { async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) {
const { selectTime, localID, encryptionKey } = upload; const { selectTime, localID, encryptionKey } = upload;
const threadID = threadInfo.id; const threadID = threadInfo.id;
const isThickThread = threadTypeIsThick(threadInfo.type);
const isEncrypted = const isEncrypted =
!!encryptionKey && !!encryptionKey &&
(upload.mediaType === 'encrypted_photo' || (upload.mediaType === 'encrypted_photo' ||
upload.mediaType === 'encrypted_video'); upload.mediaType === 'encrypted_video');
const steps = [...upload.steps]; const steps = [...upload.steps];
let userTime; let userTime;
Show All 25 Lines async uploadFile(threadInfo: ThreadInfo, upload: PendingMultimediaUpload) {
const uploadStart = Date.now(); const uploadStart = Date.now();
try { try {
const callbacks = { const callbacks = {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress(threadID, localID, percent), this.setProgress(threadID, localID, percent),
abortHandler: (abort: () => void) => abortHandler: (abort: () => void) =>
this.handleAbortCallback(threadID, localID, abort), this.handleAbortCallback(threadID, localID, abort),
}; };
const isThickThread = threadTypeIsThick(threadInfo.type);
const useBlobService = isThickThread || this.useBlobServiceUploads; const useBlobService = isThickThread || this.useBlobServiceUploads;
if ( if (
useBlobService && useBlobService &&
(upload.mediaType === 'encrypted_photo' || (upload.mediaType === 'encrypted_photo' ||
upload.mediaType === 'encrypted_video') upload.mediaType === 'encrypted_video')
) { ) {
const { blobHash, dimensions, thumbHash } = upload; const { blobHash, dimensions, thumbHash } = upload;
invariant( invariant(
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Lines this.setState(prevState => {
...prevState.pendingUploads, ...prevState.pendingUploads,
[newThreadID]: { [newThreadID]: {
...uploads, ...uploads,
[localID]: { [localID]: {
...currentUpload, ...currentUpload,
serverID: result.id, serverID: result.id,
blobHolder: result.blobHolder, blobHolder: result.blobHolder,
abort: null, abort: null,
// For thin threads we can send message right after serverID
// is present, but for thick threads we need to wait until
// a "real" Blob URI is assigned to the message.
canBeSent: !isThickThread,
}, },
}, },
}, },
}; };
}); });
if (encryptionKey) { if (encryptionKey) {
const authMetadata = await identityContext.getAuthMetadata(); const authMetadata = await identityContext.getAuthMetadata();
▲ Show 20 Lines • Show All 71 Lines • ▼ Show 20 Lines this.setState(prevState => {
...prevState.pendingUploads, ...prevState.pendingUploads,
[newThreadID]: { [newThreadID]: {
...uploads, ...uploads,
[localID]: { [localID]: {
...currentUpload, ...currentUpload,
uri: result.uri, uri: result.uri,
mediaType: outputMediaType, mediaType: outputMediaType,
dimensions: result.dimensions, dimensions: result.dimensions,
uriIsReal: true,
loop: result.loop, loop: result.loop,
uriIsReal: true,
canBeSent: true,
}, },
}, },
}, },
}; };
}); });
} }
handleAbortCallback( handleAbortCallback(
▲ Show 20 Lines • Show All 624 Lines • Show Last 20 Lines