[Keyserver] Move shared identity client resources to lib.rs
ClosedPublic
Actions

Authored by • jon on Feb 20 2023, 1:41 PM.

Details

Reviewers

varun
bartek
• max

Commits

rCOMM053c9fc02762: [Keyserver] Move shared identity client resources to lib.rs

Summary

Refactor non-endpoint specific items to root of lib.rs.
This is to help with reviewing functional changes later.

Part of https://linear.app/comm/issue/ENG-2764

Depends on D6788

Test Plan

cd keyserver/addons/rust-node-addon
cargo build

This gets end-to-end tested later

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

• jon created this revision.Feb 20 2023, 1:41 PM

Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptFeb 20 2023, 1:41 PM

Harbormaster completed remote builds in B16642: Diff 22753.Feb 20 2023, 1:56 PM

• jon requested review of this revision.Feb 20 2023, 1:56 PM

• jon added a child revision: D6790: [Keyserver/rust-addon] Call identity deleteUser on account deletion.Feb 20 2023, 1:58 PM

varun accepted this revision.Feb 21 2023, 10:00 AM

This revision is now accepted and ready to land.Feb 21 2023, 10:00 AM

Rebase on master

Harbormaster completed remote builds in B16738: Diff 22895.Feb 21 2023, 1:52 PM

Closed by commit rCOMM053c9fc02762: [Keyserver] Move shared identity client resources to lib.rs (authored by • jon). · Explain WhyFeb 22 2023, 4:26 PM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMM053c9fc02762: [Keyserver] Move shared identity client resources to lib.rs.

Revision Contents
Changeset List

Path

Size

keyserver/

addons/

rust-node-addon/

src/

identity_client.rs

42 lines

lib.rs

12 lines

Diff 22954

View Options

keyserver/addons/rust-node-addon/src/identity_client.rs

// @flow		// @flow

import invariant from 'invariant';		import invariant from 'invariant';

import {		import {
pushTypes,		pushTypes,
type CreateMessageInfoParams,		type CreateMessageInfoParams,
type MessageSpec,		type MessageSpec,
		type NotificationTextsParams,
} from './message-spec.js';		} from './message-spec.js';
import { joinResult } from './utils.js';		import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js';		import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js';		import { messageTypes } from '../../types/message-types.js';
import type {		import type {
MessageInfo,		MessageInfo,
ClientDBMessageInfo,		ClientDBMessageInfo,
} from '../../types/message-types.js';		} from '../../types/message-types.js';
import type {		import type {
CreateSidebarMessageData,		CreateSidebarMessageData,
CreateSidebarMessageInfo,		CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo,		RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js';		} from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';		import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js';		import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js';		import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js';		import type { RelativeUserInfo } from '../../types/user-types.js';
import {		import {
ET,		ET,
type EntityText,		type EntityText,
pluralizeEntityText,		pluralizeEntityText,
} from '../../utils/entity-text.js';		} from '../../utils/entity-text.js';
		import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js';		import { hasMinCodeVersion } from '../version-utils.js';

export const createSidebarMessageSpec: MessageSpec<		export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData,		CreateSidebarMessageData,
RawCreateSidebarMessageInfo,		RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo,		CreateSidebarMessageInfo,
> = Object.freeze({		> = Object.freeze({
messageContentForServerDB(		messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines	unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo,		unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo {		): RawCreateSidebarMessageInfo {
return unwrapped;		return unwrapped;
},		},

async notificationTexts(		async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>,		messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo,		threadInfo: ThreadInfo,
		params: NotificationTextsParams,
): Promise<NotifTexts> {		): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0];		const firstMessageInfo = messageInfos[0];
invariant(		invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,		firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',		'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
);		);

const creator = ET.user({ userInfo: firstMessageInfo.creator });		const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`;		const prefix = ET`${creator}`;

const initialName = firstMessageInfo.initialThreadState.name;		const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({		const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor,		userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true,		possessive: true,
});		});

let body = `started a thread in response to `;		let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`;		body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
		const { username } = params.notifTargetUserInfo;

		const secondMessageInfo = messageInfos[1];
		if (
		username &&
		secondMessageInfo &&
		secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
		secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
		isMentioned(username, secondMessageInfo.sourceMessage.text)
		) {
		body = ET`${body} that tagged you`;
		} else if (initialName) {
body = ET`${body} "${initialName}"`;		body = ET`${body} "${initialName}"`;
}		}

return {		return {
merged: ET`${prefix} ${body}`,		merged: ET`${prefix} ${body}`,
body,		body,
title: threadInfo.uiName,		title: threadInfo.uiName,
prefix,		prefix,
Show All 20 Lines