Page MenuHomePhabricator
Differential D8507

[keyserver][lib] Simplify createThread return type following deprecation of old codeVersions
ClosedPublic
Actions

Authored by ashoat on Jul 15 2023, 8:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 2, 4:22 AM
Unknown Object (File)
Thu, Mar 20, 3:14 AM
Unknown Object (File)
Mar 17 2025, 10:43 PM
Unknown Object (File)
Mar 17 2025, 10:43 PM
Unknown Object (File)
Mar 17 2025, 10:43 PM
Unknown Object (File)
Mar 17 2025, 10:34 PM
Unknown Object (File)
Mar 1 2025, 4:55 AM
Unknown Object (File)
Feb 14 2025, 8:33 AM
View All 95 Files
Subscribers
tomek

Details

Reviewers
michal
kamil
Commits
rCOMMbfb41af325bb: [keyserver][lib] Simplify createThread return type following deprecation of old…
Summary

See the first diff in the stack. We're no longer expecting to see these old codeVersions, so we're simplifying this code.

Depends on D8506

Test Plan

I tested this whole stack together by playing around with the web app and making sure thread mutation endpoints seemed to work correctly

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
25 lines
22 lines
responders/
3 lines
lib/
types/
3 lines

Diff 28741

View Options

keyserver/src/creators/account-creator.js

// @flow // @flow
import invariant from 'invariant';
import { getRustAPI } from 'rust-node-addon'; import { getRustAPI } from 'rust-node-addon';
import bcrypt from 'twin-bcrypt'; import bcrypt from 'twin-bcrypt';
import ashoat from 'lib/facts/ashoat.js'; import ashoat from 'lib/facts/ashoat.js';
import bots from 'lib/facts/bots.js'; import bots from 'lib/facts/bots.js';
import genesis from 'lib/facts/genesis.js'; import genesis from 'lib/facts/genesis.js';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { import {
▲ Show 20 Lines • Show All 158 Lines • ▼ Show 20 Lines createThread(
viewer, viewer,
{ {
type: threadTypes.PERSONAL, type: threadTypes.PERSONAL,
initialMemberIDs: [ashoat.id], initialMemberIDs: [ashoat.id],
}, },
{ forceAddMembers: true }, { forceAddMembers: true },
), ),
]); ]);
const ashoatThreadID = ashoatThreadResult.newThreadInfo const ashoatThreadID = ashoatThreadResult.newThreadID;
? ashoatThreadResult.newThreadInfo.id const privateThreadID = privateThreadResult.newThreadID;
: ashoatThreadResult.newThreadID;
const privateThreadID = privateThreadResult.newThreadInfo
? privateThreadResult.newThreadInfo.id
: privateThreadResult.newThreadID;
invariant(
ashoatThreadID && privateThreadID,
'createThread should return either newThreadInfo or newThreadID',
);
let messageTime = Date.now(); let messageTime = Date.now();
const ashoatMessageDatas = ashoatMessages.map(message => ({ const ashoatMessageDatas = ashoatMessages.map(message => ({
type: messageTypes.TEXT, type: messageTypes.TEXT,
threadID: ashoatThreadID, threadID: ashoatThreadID,
creatorID: ashoat.id, creatorID: ashoat.id,
time: messageTime++, time: messageTime++,
text: message, text: message,
▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Lines createThread(
viewer, viewer,
{ {
type: threadTypes.PERSONAL, type: threadTypes.PERSONAL,
initialMemberIDs: [ashoat.id], initialMemberIDs: [ashoat.id],
}, },
{ forceAddMembers: true }, { forceAddMembers: true },
), ),
]); ]);
const ashoatThreadID = ashoatThreadResult.newThreadInfo const ashoatThreadID = ashoatThreadResult.newThreadID;
? ashoatThreadResult.newThreadInfo.id const privateThreadID = privateThreadResult.newThreadID;
: ashoatThreadResult.newThreadID;
const privateThreadID = privateThreadResult.newThreadInfo
? privateThreadResult.newThreadInfo.id
: privateThreadResult.newThreadID;
invariant(
ashoatThreadID && privateThreadID,
'createThread should return either newThreadInfo or newThreadID',
);
let messageTime = Date.now(); let messageTime = Date.now();
const ashoatMessageDatas = ashoatMessages.map(message => ({ const ashoatMessageDatas = ashoatMessages.map(message => ({
type: messageTypes.TEXT, type: messageTypes.TEXT,
threadID: ashoatThreadID, threadID: ashoatThreadID,
creatorID: ashoat.id, creatorID: ashoat.id,
time: messageTime++, time: messageTime++,
text: message, text: message,
Show All 14 Lines
View Options

keyserver/src/creators/thread-creator.js

Show First 20 Lines • Show All 389 Lines • ▼ Show 20 Lines const {
membershipRows: ghostMembersMembershipRows, membershipRows: ghostMembersMembershipRows,
relationshipChangeset: ghostMembersRelationshipChangeset, relationshipChangeset: ghostMembersRelationshipChangeset,
} = ghostMembersChangeset; } = ghostMembersChangeset;
pushAll(membershipRows, ghostMembersMembershipRows); pushAll(membershipRows, ghostMembersMembershipRows);
relationshipChangeset.addAll(ghostMembersRelationshipChangeset); relationshipChangeset.addAll(ghostMembersRelationshipChangeset);
} }
const changeset = { membershipRows, relationshipChangeset }; const changeset = { membershipRows, relationshipChangeset };
const { threadInfos, viewerUpdates, userInfos } = const { viewerUpdates, userInfos } = await commitMembershipChangeset(
await commitMembershipChangeset(viewer, changeset, { viewer,
changeset,
{
updatesForCurrentSession, updatesForCurrentSession,
}); },
);
const initialMemberAndCreatorIDs = initialMemberIDs const initialMemberAndCreatorIDs = initialMemberIDs
? [...initialMemberIDs, viewer.userID] ? [...initialMemberIDs, viewer.userID]
: [viewer.userID]; : [viewer.userID];
const messageDatas = []; const messageDatas = [];
if (threadType !== threadTypes.SIDEBAR) { if (threadType !== threadTypes.SIDEBAR) {
messageDatas.push({ messageDatas.push({
type: messageTypes.CREATE_THREAD, type: messageTypes.CREATE_THREAD,
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Lines ) {
}); });
} }
const newMessageInfos = await createMessages( const newMessageInfos = await createMessages(
viewer, viewer,
messageDatas, messageDatas,
updatesForCurrentSession, updatesForCurrentSession,
); );
if (hasMinCodeVersion(viewer.platformDetails, { native: 62 })) {
return { return {
newThreadID: id, newThreadID: id,
updatesResult: { updatesResult: {
newUpdates: viewerUpdates, newUpdates: viewerUpdates,
}, },
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
return {
newThreadInfo: threadInfos[id],
updatesResult: {
newUpdates: viewerUpdates,
},
userInfos,
newMessageInfos,
};
}
function createPrivateThread(viewer: Viewer): Promise<NewThreadResponse> { function createPrivateThread(viewer: Viewer): Promise<NewThreadResponse> {
return createThread( return createThread(
viewer, viewer,
{ {
type: threadTypes.PRIVATE, type: threadTypes.PRIVATE,
description: privateThreadDescription, description: privateThreadDescription,
ghostMemberIDs: [commbot.userID], ghostMemberIDs: [commbot.userID],
}, },
{ {
forceAddMembers: true, forceAddMembers: true,
}, },
); );
} }
export { createThread, createPrivateThread, privateThreadDescription }; export { createThread, createPrivateThread, privateThreadDescription };
View Options

keyserver/src/responders/thread-responders.js

Show First 20 Lines • Show All 228 Lines • ▼ Show 20 Lines
]); ]);
export const newThreadResponseValidator: TInterface<NewThreadResponse> = export const newThreadResponseValidator: TInterface<NewThreadResponse> =
tShape<NewThreadResponse>({ tShape<NewThreadResponse>({
updatesResult: tShape({ updatesResult: tShape({
newUpdates: t.list(serverUpdateInfoValidator), newUpdates: t.list(serverUpdateInfoValidator),
}), }),
newMessageInfos: t.list(rawMessageInfoValidator), newMessageInfos: t.list(rawMessageInfoValidator),
newThreadInfo: t.maybe(rawThreadInfoValidator),
userInfos: userInfosValidator, userInfos: userInfosValidator,
newThreadID: t.maybe(tID), newThreadID: tID,
}); });
async function threadCreationResponder( async function threadCreationResponder(
viewer: Viewer, viewer: Viewer,
input: mixed, input: mixed,
): Promise<NewThreadResponse> { ): Promise<NewThreadResponse> {
const request = await validateInput( const request = await validateInput(
viewer, viewer,
▲ Show 20 Lines • Show All 118 Lines • Show Last 20 Lines
View Options

lib/types/thread-types.js

Loading...