Page MenuHomePhabricator
Differential D9253

[lib/keyserver] Improve state sync types
ClosedPublic
Actions

Authored by michal on Sep 21 2023, 3:49 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 3, 4:08 PM
Unknown Object (File)
Mon, Mar 3, 12:07 PM
Unknown Object (File)
Feb 23 2025, 9:11 AM
Unknown Object (File)
Feb 23 2025, 6:23 AM
Unknown Object (File)
Feb 23 2025, 6:23 AM
Unknown Object (File)
Feb 23 2025, 6:23 AM
Unknown Object (File)
Feb 16 2025, 1:56 AM
Unknown Object (File)
Feb 16 2025, 1:56 AM
View All 90 Files
Subscribers
ashoat

Details

Reviewers
inka
tomek
Commits
rCOMM9c57379d7a7e: [lib/keyserver] Improve state sync types
Summary

ENG-4909

We can keep the very specific types for specs collections that flow gives us, while adding an assert to make sure we don't pass anything that is not a spec to these object. Also replaced * -> any, as they are aliases and * is deprecated.

Test Plan

yarn flow-all

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
shared/
state-sync/
8 lines
lib/
shared/
state-sync/
8 lines

Diff 31541

View Options

keyserver/src/shared/state-sync/state-sync-specs.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines
View Options

lib/shared/state-sync/state-sync-specs.js

Show All 27 Lines
import createIDs from './id-creator.js'; import createIDs from './id-creator.js';
import createMessages from './message-creator.js'; import createMessages from './message-creator.js';
import { import {
createInitialRolesForNewThread, createInitialRolesForNewThread,
getRolePermissionBlobs, getRolePermissionBlobs,
} from './role-creator.js'; } from './role-creator.js';
import type { UpdatesForCurrentSession } from './update-creator.js'; import type { UpdatesForCurrentSession } from './update-creator.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { fetchMessageInfoByID } from '../fetchers/message-fetchers.js'; import {
fetchLatestEditMessageContentByID,
fetchMessageInfoByID,
} from '../fetchers/message-fetchers.js';
import { import {
determineThreadAncestry, determineThreadAncestry,
personalThreadQuery, personalThreadQuery,
} from '../fetchers/thread-fetchers.js'; } from '../fetchers/thread-fetchers.js';
import { import {
checkThreadPermission, checkThreadPermission,
validateCandidateMembers, validateCandidateMembers,
} from '../fetchers/thread-permission-fetchers.js'; } from '../fetchers/thread-permission-fetchers.js';
▲ Show 20 Lines • Show All 371 Lines • ▼ Show 20 Lines messageDatas.push({
}, },
}); });
} else { } else {
invariant(parentThreadID, 'parentThreadID should be set for sidebar'); invariant(parentThreadID, 'parentThreadID should be set for sidebar');
if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) { if (!sourceMessage || sourceMessage.type === messageTypes.SIDEBAR_SOURCE) {
throw new ServerError('invalid_parameters'); throw new ServerError('invalid_parameters');
} }
let editedSourceMessage = sourceMessage;
if (sourceMessageID && sourceMessage.type === messageTypes.TEXT) {
const editMessageContent = await fetchLatestEditMessageContentByID(
sourceMessageID,
);
if (editMessageContent) {
editedSourceMessage = {
...sourceMessage,
text: editMessageContent.text,
};
}
}
messageDatas.push( messageDatas.push(
{ {
type: messageTypes.SIDEBAR_SOURCE, type: messageTypes.SIDEBAR_SOURCE,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessage, sourceMessage: editedSourceMessage,
}, },
{ {
type: messageTypes.CREATE_SIDEBAR, type: messageTypes.CREATE_SIDEBAR,
threadID: id, threadID: id,
creatorID: viewer.userID, creatorID: viewer.userID,
time, time,
sourceMessageAuthorID: sourceMessage.creatorID, sourceMessageAuthorID: sourceMessage.creatorID,
initialThreadState: { initialThreadState: {
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines