Page MenuHomePhabricator
Differential D9323

[keyserver/lib] Move isInvalidSidebarSource from message-utils to message-types
AbandonedPublic
Actions

Authored by rohan on Sep 28 2023, 12:42 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 9:51 AM
Unknown Object (File)
Tue, Feb 25, 8:28 PM
Unknown Object (File)
Tue, Feb 25, 8:26 PM
Unknown Object (File)
Tue, Feb 25, 8:04 PM
Unknown Object (File)
Feb 19 2025, 7:49 AM
Unknown Object (File)
Feb 6 2025, 12:26 PM
Unknown Object (File)
Jan 25 2025, 1:11 AM
Unknown Object (File)
Jan 25 2025, 1:09 AM
View All 64 Files
Subscribers
ashoat
michal
tomek

Details

Reviewers
atul
ginsu
Summary

Just a simple moving diff since it makes more sense to be with message types in my opinion rather than message utils.

Depends on D9322

Test Plan

Ran flow and manually checked the imports were updated

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

rohan created this revision.Sep 28 2023, 12:42 PM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptSep 28 2023, 12:42 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Sep 28 2023, 12:44 PM
Harbormaster failed remote builds in B22904: Diff 31535!
rohan added a child revision: D9324: [lib] Update types for SIDEBAR_SOURCE messages to reflect isInvalidSidebarSource.Sep 28 2023, 12:47 PM
rohan requested review of this revision.Sep 28 2023, 1:34 PM

I'll rerun CI when it's back up, requesting review in the meantime

Harbormaster completed remote builds in B22904: Diff 31535.Sep 28 2023, 5:51 PM
ginsu accepted this revision.Sep 29 2023, 12:07 PM
This revision is now accepted and ready to land.Sep 29 2023, 12:07 PM
rohan abandoned this revision.Oct 10 2023, 7:57 AM
rohan added a subscriber: michal.

@michal pointed out that doing this will later cause a circular dependency, so I'm keeping it in message-utils

rohan removed a parent revision: D9322: [keyserver/lib] Dedup isMessageSidebarSourceReactionEditOrPin into isInvalidSidebarSource.Oct 10 2023, 7:58 AM
rohan removed a child revision: D9324: [lib] Update types for SIDEBAR_SOURCE messages to reflect isInvalidSidebarSource.

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
2 lines
fetchers/
6 lines
lib/
shared/
12 lines
messages/
2 lines
3 lines
types/
11 lines
types/
shared/
message-types.test.js
message-utils.test.js
48 lines

Diff 31535

View Options

keyserver/src/creators/thread-creator.js

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines createSelector(stateSyncSpecSelectors, (...specs) => {
return { specsPerHashKey, specPerInnerHashKey }; return { specsPerHashKey, specPerInnerHashKey };
}); });
const getClientResponsesSelector: ( const getClientResponsesSelector: (
state: AppState, state: AppState,
) => ( ) => (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector( ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
boundStateSyncSpecsSelector, boundStateSyncSpecsSelector,
currentCalendarQuery, currentCalendarQuery,
( (
{ specsPerHashKey, specPerInnerHashKey }, { specsPerHashKey, specPerInnerHashKey },
calendarQuery: (calendarActive: boolean) => CalendarQuery, calendarQuery: (calendarActive: boolean) => CalendarQuery,
) => { ) => {
return async ( return async (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
): Promise<$ReadOnlyArray<ClientClientResponse>> => { ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
const clientResponses = []; const clientResponses = [];
const serverRequestedPlatformDetails = serverRequests.some( const serverRequestedPlatformDetails = serverRequests.some(
request => request.type === serverRequestTypes.PLATFORM_DETAILS, request => request.type === serverRequestTypes.PLATFORM_DETAILS,
); );
for (const serverRequest of serverRequests) { for (const serverRequest of serverRequests) {
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
for (let i = 0; i < minimumOneTimeKeysRequired; ++i) { for (let i = 0; i < minimumOneTimeKeysRequired; ++i) {
keys.push(oneTimeKeyGenerator(i)); keys.push(oneTimeKeyGenerator(i));
} }
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.MORE_ONE_TIME_KEYS, type: serverRequestTypes.MORE_ONE_TIME_KEYS,
keys, keys,
}); });
} else if ( } else if (
serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB && serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB
getSignedIdentityKeysBlob
) { ) {
const signedIdentityKeysBlob = await getSignedIdentityKeysBlob(); const signedIdentityKeysBlob = await getSignedIdentityKeysBlob();
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB, type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB,
signedIdentityKeysBlob, signedIdentityKeysBlob,
}); });
} else if ( } else if (
serverRequest.type === serverRequest.type ===
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines
View Options

keyserver/src/fetchers/message-fetchers.js

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines createSelector(stateSyncSpecSelectors, (...specs) => {
return { specsPerHashKey, specPerInnerHashKey }; return { specsPerHashKey, specPerInnerHashKey };
}); });
const getClientResponsesSelector: ( const getClientResponsesSelector: (
state: AppState, state: AppState,
) => ( ) => (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector( ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
boundStateSyncSpecsSelector, boundStateSyncSpecsSelector,
currentCalendarQuery, currentCalendarQuery,
( (
{ specsPerHashKey, specPerInnerHashKey }, { specsPerHashKey, specPerInnerHashKey },
calendarQuery: (calendarActive: boolean) => CalendarQuery, calendarQuery: (calendarActive: boolean) => CalendarQuery,
) => { ) => {
return async ( return async (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
): Promise<$ReadOnlyArray<ClientClientResponse>> => { ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
const clientResponses = []; const clientResponses = [];
const serverRequestedPlatformDetails = serverRequests.some( const serverRequestedPlatformDetails = serverRequests.some(
request => request.type === serverRequestTypes.PLATFORM_DETAILS, request => request.type === serverRequestTypes.PLATFORM_DETAILS,
); );
for (const serverRequest of serverRequests) { for (const serverRequest of serverRequests) {
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
for (let i = 0; i < minimumOneTimeKeysRequired; ++i) { for (let i = 0; i < minimumOneTimeKeysRequired; ++i) {
keys.push(oneTimeKeyGenerator(i)); keys.push(oneTimeKeyGenerator(i));
} }
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.MORE_ONE_TIME_KEYS, type: serverRequestTypes.MORE_ONE_TIME_KEYS,
keys, keys,
}); });
} else if ( } else if (
serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB && serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB
getSignedIdentityKeysBlob
) { ) {
const signedIdentityKeysBlob = await getSignedIdentityKeysBlob(); const signedIdentityKeysBlob = await getSignedIdentityKeysBlob();
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB, type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB,
signedIdentityKeysBlob, signedIdentityKeysBlob,
}); });
} else if ( } else if (
serverRequest.type === serverRequest.type ===
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines
View Options

lib/shared/message-utils.js

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines createSelector(stateSyncSpecSelectors, (...specs) => {
return { specsPerHashKey, specPerInnerHashKey }; return { specsPerHashKey, specPerInnerHashKey };
}); });
const getClientResponsesSelector: ( const getClientResponsesSelector: (
state: AppState, state: AppState,
) => ( ) => (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector( ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
boundStateSyncSpecsSelector, boundStateSyncSpecsSelector,
currentCalendarQuery, currentCalendarQuery,
( (
{ specsPerHashKey, specPerInnerHashKey }, { specsPerHashKey, specPerInnerHashKey },
calendarQuery: (calendarActive: boolean) => CalendarQuery, calendarQuery: (calendarActive: boolean) => CalendarQuery,
) => { ) => {
return async ( return async (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
): Promise<$ReadOnlyArray<ClientClientResponse>> => { ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
const clientResponses = []; const clientResponses = [];
const serverRequestedPlatformDetails = serverRequests.some( const serverRequestedPlatformDetails = serverRequests.some(
request => request.type === serverRequestTypes.PLATFORM_DETAILS, request => request.type === serverRequestTypes.PLATFORM_DETAILS,
); );
for (const serverRequest of serverRequests) { for (const serverRequest of serverRequests) {
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
for (let i = 0; i < minimumOneTimeKeysRequired; ++i) { for (let i = 0; i < minimumOneTimeKeysRequired; ++i) {
keys.push(oneTimeKeyGenerator(i)); keys.push(oneTimeKeyGenerator(i));
} }
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.MORE_ONE_TIME_KEYS, type: serverRequestTypes.MORE_ONE_TIME_KEYS,
keys, keys,
}); });
} else if ( } else if (
serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB && serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB
getSignedIdentityKeysBlob
) { ) {
const signedIdentityKeysBlob = await getSignedIdentityKeysBlob(); const signedIdentityKeysBlob = await getSignedIdentityKeysBlob();
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB, type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB,
signedIdentityKeysBlob, signedIdentityKeysBlob,
}); });
} else if ( } else if (
serverRequest.type === serverRequest.type ===
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines
View Options

lib/shared/message-utils.test.js

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines createSelector(stateSyncSpecSelectors, (...specs) => {
return { specsPerHashKey, specPerInnerHashKey }; return { specsPerHashKey, specPerInnerHashKey };
}); });
const getClientResponsesSelector: ( const getClientResponsesSelector: (
state: AppState, state: AppState,
) => ( ) => (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector( ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
boundStateSyncSpecsSelector, boundStateSyncSpecsSelector,
currentCalendarQuery, currentCalendarQuery,
( (
{ specsPerHashKey, specPerInnerHashKey }, { specsPerHashKey, specPerInnerHashKey },
calendarQuery: (calendarActive: boolean) => CalendarQuery, calendarQuery: (calendarActive: boolean) => CalendarQuery,
) => { ) => {
return async ( return async (
calendarActive: boolean, calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator, oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>, getSignedIdentityKeysBlob: () => Promise<SignedIdentityKeysBlob>,
getInitialNotificationsEncryptedMessage: ?() => Promise<string>, getInitialNotificationsEncryptedMessage: ?() => Promise<string>,
serverRequests: $ReadOnlyArray<ClientServerRequest>, serverRequests: $ReadOnlyArray<ClientServerRequest>,
): Promise<$ReadOnlyArray<ClientClientResponse>> => { ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
const clientResponses = []; const clientResponses = [];
const serverRequestedPlatformDetails = serverRequests.some( const serverRequestedPlatformDetails = serverRequests.some(
request => request.type === serverRequestTypes.PLATFORM_DETAILS, request => request.type === serverRequestTypes.PLATFORM_DETAILS,
); );
for (const serverRequest of serverRequests) { for (const serverRequest of serverRequests) {
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines ): Promise<$ReadOnlyArray<ClientClientResponse>> => {
for (let i = 0; i < minimumOneTimeKeysRequired; ++i) { for (let i = 0; i < minimumOneTimeKeysRequired; ++i) {
keys.push(oneTimeKeyGenerator(i)); keys.push(oneTimeKeyGenerator(i));
} }
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.MORE_ONE_TIME_KEYS, type: serverRequestTypes.MORE_ONE_TIME_KEYS,
keys, keys,
}); });
} else if ( } else if (
serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB && serverRequest.type === serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB
getSignedIdentityKeysBlob
) { ) {
const signedIdentityKeysBlob = await getSignedIdentityKeysBlob(); const signedIdentityKeysBlob = await getSignedIdentityKeysBlob();
clientResponses.push({ clientResponses.push({
type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB, type: serverRequestTypes.SIGNED_IDENTITY_KEYS_BLOB,
signedIdentityKeysBlob, signedIdentityKeysBlob,
}); });
} else if ( } else if (
serverRequest.type === serverRequest.type ===
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines
View Options

lib/shared/messages/sidebar-source-message-spec.js

Loading...
View Options

lib/shared/thread-utils.js

Loading...
View Options

lib/types/message-types.js

Loading...
View Options

lib/types/message-types.test.js

Loading...