Page MenuHomePhabricator
Differential D10757

[lib] refactor adding keyserver to ops
ClosedPublic
Actions

Authored by kamil on Jan 22 2024, 2:53 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 8, 10:34 PM
Unknown Object (File)
Feb 21 2025, 11:41 AM
Unknown Object (File)
Feb 21 2025, 11:41 AM
Unknown Object (File)
Feb 21 2025, 11:40 AM
Unknown Object (File)
Feb 21 2025, 11:40 AM
Unknown Object (File)
Jan 23 2025, 2:50 PM
Unknown Object (File)
Jan 22 2025, 5:38 AM
Unknown Object (File)
Jan 5 2025, 7:45 PM
View All 60 Files
Subscribers
ashoat
tomek

Details

Reviewers
inka
Commits
rCOMMabdd92dbbe72: [lib] refactor adding keyserver to ops
Summary

Convert logic to ops approach.

Depends on D10755

Test Plan
  1. Remove validation while adding keyserver
  2. Add keyserver

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jan 22 2024, 2:53 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJan 22 2024, 2:53 AM
kamil added a child revision: D10758: [lib] refactor removing keyserver to ops.Jan 22 2024, 2:54 AM
Harbormaster failed remote builds in B25980: Diff 35912!Jan 22 2024, 3:19 AM
kamil published this revision for review.Jan 22 2024, 6:32 AM
inka accepted this revision.Jan 22 2024, 9:05 AM
This revision is now accepted and ready to land.Jan 22 2024, 9:05 AM
This revision was landed with ongoing or failed builds.Jan 31 2024, 8:23 AM
Closed by commit rCOMMabdd92dbbe72: [lib] refactor adding keyserver to ops (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMabdd92dbbe72: [lib] refactor adding keyserver to ops.

Revision Contents
Changeset List

PathSize
lib/
reducers/
21 lines

Diff 36388

View Options

lib/reducers/keyserver-reducer.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js'; import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js'; import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js'; import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
keyserverRegisterActionTypes, keyserverRegisterActionTypes,
logInActionTypes, logInActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import {
keyserverStoreOpsHandlers,
type ReplaceKeyserverOperation,
} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js'; import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js'; import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js'; import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js'; import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): { state: T, storeOperations: StoreOperations } {
if ( if (
action.type !== incrementalStateSyncActionType && action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType && action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success && action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success && action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success && action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType action.type !== addKeyserverActionType
) { ) {
const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) { for (const keyserverID in keyserverStore.keyserverInfos) {
if ( if (
keyserverStore.keyserverInfos[keyserverID].connection.status === keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected' 'connected'
) { ) {
continue; continue;
} }
if ( if (
messageStore.currentAsOf[keyserverID] !== messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID] state.messageStore.currentAsOf[keyserverID]
) { ) {
messageStore = { messageStore = {
...messageStore, ...messageStore,
currentAsOf: { currentAsOf: {
...messageStore.currentAsOf, ...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID], [keyserverID]: state.messageStore.currentAsOf[keyserverID],
}, },
}; };
} }
if ( if (
state.keyserverStore.keyserverInfos[keyserverID] && state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !== keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) { ) {
const keyserverInfos = { ...keyserverStore.keyserverInfos }; replaceOperations.push({
keyserverInfos[keyserverID] = { type: 'replace_keyserver',
...keyserverInfos[keyserverID], payload: {
id: keyserverID,
keyserverInfo: {
...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf: updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf, state.keyserverStore.keyserverInfos[keyserverID]
}; .updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos }; },
},
});
} }
} }
if (replaceOperations.length > 0) {
keyserverStore = {
...keyserverStore,
keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
keyserverStore.keyserverInfos,
replaceOperations,
),
};
}
} }
const { draftStore, draftStoreOperations } = reduceDraftStore( const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore, state.draftStore,
action, action,
); );
const { reportStore, reportStoreOperations } = reduceReportStore( const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines