Paths

Table of Contentst

-
keyserver/src/creators/
-
src/
-
creators/
-
message-creator.js
-
lib/shared/messages/
-
shared/
-
messages/
-
add-members-message-spec.js
-
change-role-message-spec.js
-
change-settings-message-spec.js
-
create-entry-message-spec.js
-
create-sidebar-message-spec.js
-
create-sub-thread-message-spec.js
-
create-thread-message-spec.js
-
delete-entry-message-spec.js
-
edit-entry-message-spec.js
-
join-thread-message-spec.js
-
leave-thread-message-spec.js
-
message-spec.js
-
multimedia-message-spec.js
-
reaction-message-spec.js
-
remove-members-message-spec.js
-
restore-entry-message-spec.js
-
sidebar-source-message-spec.js
-
text-message-spec.js
-
unsupported-message-spec.js
-
update-relationship-message-spec.js

[lib/keyserver] convert generatesNotif to return a enum
ClosedPublic
Actions

Authored by ginsu on Jan 11 2023, 12:11 PM.

Details

Reviewers

atul
ashoat
tomek

Commits

rCOMM2b08c6c1367b: [lib/keyserver] convert generatesNotif to return a enum

Summary

convert generatesNotif to return a enum, either NOTIF or RESCIND, or undefined if the message type should not send a push notif.

Linear Task: ENG-2644

Test Plan

flow also tested chat creation, message creation, message liking/unliking, and adding members to a chat

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ginsu created this revision.Jan 11 2023, 12:11 PM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 11 2023, 12:11 PM

ginsu edited the summary of this revision. (Show Details)Jan 11 2023, 12:13 PM

ginsu added reviewers: ashoat, tomek.

Harbormaster completed remote builds in B15262: Diff 20810.Jan 11 2023, 12:26 PM

ginsu requested review of this revision.Jan 11 2023, 12:26 PM

I think it would be good to update message-creator.js in this diff, so doesGenerateNotif ? messageInfo : undefined checks if it's pushTypes.NOTIF specifically. As of this revision, returning RESCIND would result in a new push notif being sent, which seems unexpected

This revision now requires changes to proceed.Jan 11 2023, 12:57 PM

address ashoat's comments

ginsu retitled this revision from [lib] convert generatesNotif to return a enum to [lib/keyserver] convert generatesNotif to return a enum.Jan 11 2023, 4:10 PM

Harbormaster completed remote builds in B15276: Diff 20832.Jan 11 2023, 4:22 PM

Please address comment before landing

keyserver/src/creators/message-creator.js
400 ↗	(On Diff #20832)	We don't need the start of this

This revision is now accepted and ready to land.Jan 11 2023, 6:53 PM

address ashoat's comments

Harbormaster completed remote builds in B15279: Diff 20837.Jan 11 2023, 8:15 PM

Closed by commit rCOMM2b08c6c1367b: [lib/keyserver] convert generatesNotif to return a enum (authored by ginsu). · Explain WhyJan 11 2023, 8:16 PM

This revision was automatically updated to reflect the committed changes.

ginsu added a commit: rCOMM2b08c6c1367b: [lib/keyserver] convert generatesNotif to return a enum.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

creators/

message-creator.js

5 lines

lib/

shared/

messages/

add-members-message-spec.js

2 lines

change-role-message-spec.js

15 lines

change-settings-message-spec.js

13 lines

create-entry-message-spec.js

11 lines

create-sidebar-message-spec.js

13 lines

create-sub-thread-message-spec.js

17 lines

create-thread-message-spec.js

15 lines

delete-entry-message-spec.js

11 lines

edit-entry-message-spec.js

11 lines

join-thread-message-spec.js

2 lines

leave-thread-message-spec.js

2 lines

message-spec.js

8 lines

multimedia-message-spec.js

14 lines

reaction-message-spec.js

15 lines

remove-members-message-spec.js

2 lines

restore-entry-message-spec.js

11 lines

sidebar-source-message-spec.js

2 lines

text-message-spec.js

12 lines

unsupported-message-spec.js

8 lines

update-relationship-message-spec.js

13 lines

Diff 20838

View Options

keyserver/src/creators/message-creator.js

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	function convertUserInfosToReplaceUserOps(
userInfos: UserInfos,		userInfos: UserInfos,
): $ReadOnlyArray<UserStoreOperation> {		): $ReadOnlyArray<UserStoreOperation> {
return values(userInfos).map(userInfo => ({		return values(userInfos).map(userInfo => ({
type: 'replace_user',		type: 'replace_user',
payload: userInfo,		payload: userInfo,
}));		}));
}		}

		function convertUserInfoToClientDBUserInfo(user: UserInfo): ClientDBUserInfo {
		return {
		id: user.id,
		userInfo: JSON.stringify(user),
		};
		}

const userStoreOpsHandlers: BaseStoreOpsHandlers<		const userStoreOpsHandlers: BaseStoreOpsHandlers<
UserInfos,		UserInfos,
UserStoreOperation,		UserStoreOperation,
ClientDBUserStoreOperation,		ClientDBUserStoreOperation,
UserInfos,		UserInfos,
ClientDBUserInfo,		ClientDBUserInfo,
> = {		> = {
processStoreOperations(		processStoreOperations(
Show All 14 Lines	for (const operation: UserStoreOperation of ops) {
}		}
} else if (operation.type === 'remove_all_users') {		} else if (operation.type === 'remove_all_users') {
processedUserInfos = {};		processedUserInfos = {};
}		}
}		}
return processedUserInfos;		return processedUserInfos;
},		},

convertOpsToClientDBOps(): $ReadOnlyArray<ClientDBUserStoreOperation> {		convertOpsToClientDBOps(
return [];		ops: $ReadOnlyArray<UserStoreOperation>,
		): $ReadOnlyArray<ClientDBUserStoreOperation> {
		return ops.map(operation => {
		if (
		operation.type === 'remove_users' \|\|
		operation.type === 'remove_all_users'
		) {
		return operation;
		}
		return {
		type: 'replace_user',
		payload: convertUserInfoToClientDBUserInfo(operation.payload),
		};
		});
},		},
translateClientDBData(): UserInfos {		translateClientDBData(users: $ReadOnlyArray<ClientDBUserInfo>): UserInfos {
return {};		const userInfos: { [id: string]: UserInfo } = {};
		users.forEach(dbUser => {
		userInfos[dbUser.id] = JSON.parse(dbUser.userInfo);
		});

		return userInfos;
},		},
};		};

export { userStoreOpsHandlers, convertUserInfosToReplaceUserOps };		export {
		userStoreOpsHandlers,
		convertUserInfosToReplaceUserOps,
		convertUserInfoToClientDBUserInfo,
		};

View Options

lib/shared/messages/add-members-message-spec.js

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	function convertUserInfosToReplaceUserOps(
userInfos: UserInfos,		userInfos: UserInfos,
): $ReadOnlyArray<UserStoreOperation> {		): $ReadOnlyArray<UserStoreOperation> {
return values(userInfos).map(userInfo => ({		return values(userInfos).map(userInfo => ({
type: 'replace_user',		type: 'replace_user',
payload: userInfo,		payload: userInfo,
}));		}));
}		}

		function convertUserInfoToClientDBUserInfo(user: UserInfo): ClientDBUserInfo {
		return {
		id: user.id,
		userInfo: JSON.stringify(user),
		};
		}

const userStoreOpsHandlers: BaseStoreOpsHandlers<		const userStoreOpsHandlers: BaseStoreOpsHandlers<
UserInfos,		UserInfos,
UserStoreOperation,		UserStoreOperation,
ClientDBUserStoreOperation,		ClientDBUserStoreOperation,
UserInfos,		UserInfos,
ClientDBUserInfo,		ClientDBUserInfo,
> = {		> = {
processStoreOperations(		processStoreOperations(
Show All 14 Lines	for (const operation: UserStoreOperation of ops) {
}		}
} else if (operation.type === 'remove_all_users') {		} else if (operation.type === 'remove_all_users') {
processedUserInfos = {};		processedUserInfos = {};
}		}
}		}
return processedUserInfos;		return processedUserInfos;
},		},

convertOpsToClientDBOps(): $ReadOnlyArray<ClientDBUserStoreOperation> {		convertOpsToClientDBOps(
return [];		ops: $ReadOnlyArray<UserStoreOperation>,
		): $ReadOnlyArray<ClientDBUserStoreOperation> {
		return ops.map(operation => {
		if (
		operation.type === 'remove_users' \|\|
		operation.type === 'remove_all_users'
		) {
		return operation;
		}
		return {
		type: 'replace_user',
		payload: convertUserInfoToClientDBUserInfo(operation.payload),
		};
		});
},		},
translateClientDBData(): UserInfos {		translateClientDBData(users: $ReadOnlyArray<ClientDBUserInfo>): UserInfos {
return {};		const userInfos: { [id: string]: UserInfo } = {};
		users.forEach(dbUser => {
		userInfos[dbUser.id] = JSON.parse(dbUser.userInfo);
		});

		return userInfos;
},		},
};		};

export { userStoreOpsHandlers, convertUserInfosToReplaceUserOps };		export {
		userStoreOpsHandlers,
		convertUserInfosToReplaceUserOps,
		convertUserInfoToClientDBUserInfo,
		};

View Options

lib/shared/messages/change-role-message-spec.js

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	function convertUserInfosToReplaceUserOps(
userInfos: UserInfos,		userInfos: UserInfos,
): $ReadOnlyArray<UserStoreOperation> {		): $ReadOnlyArray<UserStoreOperation> {
return values(userInfos).map(userInfo => ({		return values(userInfos).map(userInfo => ({
type: 'replace_user',		type: 'replace_user',
payload: userInfo,		payload: userInfo,
}));		}));
}		}

		function convertUserInfoToClientDBUserInfo(user: UserInfo): ClientDBUserInfo {
		return {
		id: user.id,
		userInfo: JSON.stringify(user),
		};
		}

const userStoreOpsHandlers: BaseStoreOpsHandlers<		const userStoreOpsHandlers: BaseStoreOpsHandlers<
UserInfos,		UserInfos,
UserStoreOperation,		UserStoreOperation,
ClientDBUserStoreOperation,		ClientDBUserStoreOperation,
UserInfos,		UserInfos,
ClientDBUserInfo,		ClientDBUserInfo,
> = {		> = {
processStoreOperations(		processStoreOperations(
Show All 14 Lines	for (const operation: UserStoreOperation of ops) {
}		}
} else if (operation.type === 'remove_all_users') {		} else if (operation.type === 'remove_all_users') {
processedUserInfos = {};		processedUserInfos = {};
}		}
}		}
return processedUserInfos;		return processedUserInfos;
},		},

convertOpsToClientDBOps(): $ReadOnlyArray<ClientDBUserStoreOperation> {		convertOpsToClientDBOps(
return [];		ops: $ReadOnlyArray<UserStoreOperation>,
		): $ReadOnlyArray<ClientDBUserStoreOperation> {
		return ops.map(operation => {
		if (
		operation.type === 'remove_users' \|\|
		operation.type === 'remove_all_users'
		) {
		return operation;
		}
		return {
		type: 'replace_user',
		payload: convertUserInfoToClientDBUserInfo(operation.payload),
		};
		});
},		},
translateClientDBData(): UserInfos {		translateClientDBData(users: $ReadOnlyArray<ClientDBUserInfo>): UserInfos {
return {};		const userInfos: { [id: string]: UserInfo } = {};
		users.forEach(dbUser => {
		userInfos[dbUser.id] = JSON.parse(dbUser.userInfo);
		});

		return userInfos;
},		},
};		};

export { userStoreOpsHandlers, convertUserInfosToReplaceUserOps };		export {
		userStoreOpsHandlers,
		convertUserInfosToReplaceUserOps,
		convertUserInfoToClientDBUserInfo,
		};

View Options

lib/shared/messages/change-settings-message-spec.js

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines	function convertUserInfosToReplaceUserOps(
userInfos: UserInfos,		userInfos: UserInfos,
): $ReadOnlyArray<UserStoreOperation> {		): $ReadOnlyArray<UserStoreOperation> {
return values(userInfos).map(userInfo => ({		return values(userInfos).map(userInfo => ({
type: 'replace_user',		type: 'replace_user',
payload: userInfo,		payload: userInfo,
}));		}));
}		}

		function convertUserInfoToClientDBUserInfo(user: UserInfo): ClientDBUserInfo {
		return {
		id: user.id,
		userInfo: JSON.stringify(user),
		};
		}

const userStoreOpsHandlers: BaseStoreOpsHandlers<		const userStoreOpsHandlers: BaseStoreOpsHandlers<
UserInfos,		UserInfos,
UserStoreOperation,		UserStoreOperation,
ClientDBUserStoreOperation,		ClientDBUserStoreOperation,
UserInfos,		UserInfos,
ClientDBUserInfo,		ClientDBUserInfo,
> = {		> = {
processStoreOperations(		processStoreOperations(
Show All 14 Lines	for (const operation: UserStoreOperation of ops) {
}		}
} else if (operation.type === 'remove_all_users') {		} else if (operation.type === 'remove_all_users') {
processedUserInfos = {};		processedUserInfos = {};
}		}
}		}
return processedUserInfos;		return processedUserInfos;
},		},

convertOpsToClientDBOps(): $ReadOnlyArray<ClientDBUserStoreOperation> {		convertOpsToClientDBOps(
return [];		ops: $ReadOnlyArray<UserStoreOperation>,
		): $ReadOnlyArray<ClientDBUserStoreOperation> {
		return ops.map(operation => {
		if (
		operation.type === 'remove_users' \|\|
		operation.type === 'remove_all_users'
		) {
		return operation;
		}
		return {
		type: 'replace_user',
		payload: convertUserInfoToClientDBUserInfo(operation.payload),
		};
		});
},		},
translateClientDBData(): UserInfos {		translateClientDBData(users: $ReadOnlyArray<ClientDBUserInfo>): UserInfos {
return {};		const userInfos: { [id: string]: UserInfo } = {};
		users.forEach(dbUser => {
		userInfos[dbUser.id] = JSON.parse(dbUser.userInfo);
		});

		return userInfos;
},		},
};		};

export { userStoreOpsHandlers, convertUserInfosToReplaceUserOps };		export {
		userStoreOpsHandlers,
		convertUserInfosToReplaceUserOps,
		convertUserInfoToClientDBUserInfo,
		};