[lib] Naively update `threadInfoFromRawThreadInfo` to support `RawThreadInfo` argument
ClosedPublic
Actions

Authored by atul on Dec 10 2023, 7:00 PM.

Details

Reviewers

ashoat
ginsu
tomek
rohan

Commits

rCOMMe87c28f8156f: [lib] Naively update `threadInfoFromRawThreadInfo` to support `RawThreadInfo`…

Summary

This will definitely be tidied up in subsequent diff or after rebasing... but this unblocks some keyserver work that I wanted to go ahead and put up ASAP.

Depends on D10284

Test Plan

CI/flow/etc.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

atul created this revision.Dec 10 2023, 7:00 PM

atul published this revision for review.Dec 10 2023, 7:02 PM

Harbormaster completed remote builds in B24931: Diff 34465.Dec 10 2023, 7:19 PM

atul added a child revision: D10286: [keyserver] Update `rawThreadInfoFromServerThreadInfo` to support `minimallyEncodePermissions` option.Dec 10 2023, 7:22 PM

atul mentioned this in D10235: [lib] Update `getRelativeMemberInfos` to handle both `MinimallyEncoded` and `Legacy` variants.Dec 11 2023, 9:39 AM

ashoat accepted this revision.Dec 11 2023, 11:18 AM

ashoat added inline comments.

lib/shared/thread-utils.js
899 ↗	(On Diff #34465)	I don't think this counts as "ridiculous" branching. It's necessary because there are indeed differences in the two, such as `getCurrentUser` vs. `getMinimallyEncodedCurrentUser` Nit, but can you maybe remove "ridiculous" here?

This revision is now accepted and ready to land.Dec 11 2023, 11:18 AM

atul added inline comments.Dec 13 2023, 3:11 PM

lib/shared/thread-utils.js
899 ↗	(On Diff #34465)	Yeah that's fair, this might be unavoidable. Will remove comment altogether for now.

address feedback

Harbormaster completed remote builds in B25052: Diff 34612.Dec 13 2023, 4:13 PM

Closed by commit rCOMMe87c28f8156f: [lib] Naively update `threadInfoFromRawThreadInfo` to support `RawThreadInfo`… (authored by atul). · Explain WhyDec 14 2023, 1:03 PM

This revision was automatically updated to reflect the committed changes.

atul added a commit: rCOMMe87c28f8156f: [lib] Naively update `threadInfoFromRawThreadInfo` to support `RawThreadInfo`….

Revision Contents
Changeset List

Path

Size

lib/

shared/

thread-utils.js

65 lines

Diff 34677

View Options

lib/shared/thread-utils.js

	// @flow			// @flow

	import _keyBy from 'lodash/fp/keyBy.js';
	import _mapValues from 'lodash/fp/mapValues.js';
	import * as React from 'react';			import * as React from 'react';
	import { createSelector } from 'reselect';			import { createSelector } from 'reselect';

	import { useENSNames } from '../hooks/ens-cache.js';			import { useENSNames } from '../hooks/ens-cache.js';
	import SearchIndex from '../shared/search-index.js';			import SearchIndex from '../shared/search-index.js';
	import { roleIsAdminRole } from '../shared/thread-utils.js';			import {
				roleIsAdminRole,
				useCommunityRootMembersToRole,
				} from '../shared/thread-utils.js';
	import type { Platform } from '../types/device-types.js';			import type { Platform } from '../types/device-types.js';
	import {			import {
	type CalendarQuery,			type CalendarQuery,
	defaultCalendarQuery,			defaultCalendarQuery,
	} from '../types/entry-types.js';			} from '../types/entry-types.js';
	import type { CalendarFilter } from '../types/filter-types.js';			import type { CalendarFilter } from '../types/filter-types.js';
	import type {			import type {
	ThreadInfo,			ThreadInfo,
	RelativeMemberInfo,			RelativeMemberInfo,
	RawThreadInfo,			RawThreadInfo,
	MemberInfo,
	} from '../types/minimally-encoded-thread-permissions-types.js';			} from '../types/minimally-encoded-thread-permissions-types.js';
	import type { BaseNavInfo } from '../types/nav-types.js';			import type { BaseNavInfo } from '../types/nav-types.js';
	import type { BaseAppState } from '../types/redux-types.js';			import type { BaseAppState } from '../types/redux-types.js';
	import { threadTypeIsCommunityRoot } from '../types/thread-types-enum.js';
	import type { UserInfo } from '../types/user-types.js';			import type { UserInfo } from '../types/user-types.js';
	import { getConfig } from '../utils/config.js';			import { getConfig } from '../utils/config.js';
	import { values } from '../utils/objects.js';			import { values } from '../utils/objects.js';
	import { useSelector } from '../utils/redux-utils.js';			import { useSelector } from '../utils/redux-utils.js';

	function timeUntilCalendarRangeExpiration(			function timeUntilCalendarRangeExpiration(
	lastUserInteractionCalendar: number,			lastUserInteractionCalendar: number,
	): ?number {			): ?number {
	▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
	function useThreadSearchIndex(			function useThreadSearchIndex(
	threadInfos: $ReadOnlyArray<RawThreadInfo \| ThreadInfo>,			threadInfos: $ReadOnlyArray<RawThreadInfo \| ThreadInfo>,
	): SearchIndex {			): SearchIndex {
	const userInfos = useSelector(state => state.userStore.userInfos);			const userInfos = useSelector(state => state.userStore.userInfos);
	const viewerID = useSelector(			const viewerID = useSelector(
	state => state.currentUserInfo && state.currentUserInfo.id,			state => state.currentUserInfo && state.currentUserInfo.id,
	);			);

	const communityRootMembersToRole = React.useMemo(() => {			const communityRootMembersToRole = useCommunityRootMembersToRole(threadInfos);
	const communityThreadInfos = threadInfos.filter(threadInfo =>
	threadTypeIsCommunityRoot(threadInfo.type),
	);
	const communityRoots = _keyBy('id')(communityThreadInfos);

	return _mapValues((threadInfo: ThreadInfo \| RawThreadInfo) => {
	const keyedMembers = _keyBy('id')(threadInfo.members);
	const keyedMembersToRole = _mapValues(
	(member: MemberInfo \| RelativeMemberInfo) => {
	return member.role ? threadInfo.roles[member.role] : null;
	},
	)(keyedMembers);
	return keyedMembersToRole;
	})(communityRoots);
	}, [threadInfos]);

	const nonViewerMembers = React.useMemo(() => {			const nonViewerMembers = React.useMemo(() => {
	const allMembersOfAllThreads = new Map<string, UserInfo>();			const allMembersOfAllThreads = new Map<string, UserInfo>();
	for (const threadInfo of threadInfos) {			for (const threadInfo of threadInfos) {
	for (const member of threadInfo.members) {			for (const member of threadInfo.members) {
	const communityRole =			const communityRole =
	communityRootMembersToRole[threadInfo.community]?.[member.id];			communityRootMembersToRole[threadInfo.community]?.[member.id];
	const isParentAdmin = roleIsAdminRole(communityRole);			const isParentAdmin = roleIsAdminRole(communityRole);
	▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines

[lib] Naively update `threadInfoFromRawThreadInfo` to support `RawThreadInfo` argumentClosedPublicActions