Page MenuHomePhabricator
Differential D10068

[lib] Re-introduce `RoleInfo` (`[Legacy/MinimallyEncoded]RoleInfo`)
ClosedPublic
Actions

Authored by atul on Nov 28 2023, 7:15 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 7:42 AM
Unknown Object (File)
Mon, Apr 7, 4:07 AM
Unknown Object (File)
Mon, Apr 7, 3:40 AM
Unknown Object (File)
Sun, Apr 6, 11:12 PM
Unknown Object (File)
Sun, Apr 6, 8:19 AM
Unknown Object (File)
Sun, Apr 6, 1:47 AM
Unknown Object (File)
Feb 27 2025, 7:23 PM
Unknown Object (File)
Feb 27 2025, 7:14 PM
View All 95 Files
Subscribers
None

Details

Reviewers
ashoat
ginsu
tomek
rohan
Commits
rCOMMc2810872327a: [lib] Re-introduce `RoleInfo` (`[Legacy/MinimallyEncoded]RoleInfo`)
Summary

Replace usages of LegacyRoleInfo | MinimallyEncodedRoleInfo with re-introduced RoleInfo.

This doesn't make much of a difference with RoleInfo since there are just a few occurrences, but has more of an impact on eg MinimallyEncodedThreadInfo

Depends on D10066

Test Plan

flow/CI/etc.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul updated this revision to Diff 33944.Nov 28 2023, 7:15 AM
atul created this revision.

rebase

Harbormaster failed remote builds in B24566: Diff 33942!Nov 28 2023, 7:31 AM
atul added a child revision: D10071: [lib] `MemberInfo` -> `LegacyMemberInfo`.Nov 28 2023, 7:43 AM
atul published this revision for review.Nov 28 2023, 7:43 AM
Harbormaster completed remote builds in B24568: Diff 33944.Nov 28 2023, 8:20 AM
atul mentioned this in D10074: [lib] Re-introduce `RelativeMemberInfo` (`[Legacy/MinimallyEncoded]RelativeMemberInfo`).Nov 28 2023, 9:48 AM
ashoat accepted this revision.Nov 28 2023, 12:54 PM
This revision is now accepted and ready to land.Nov 28 2023, 12:54 PM
atul mentioned this in D10078: [lib] Reintroduce `RawThreadInfo` (`[Legacy/MinimallyEncoded]RawThreadInfo`).Nov 28 2023, 1:36 PM
Closed by commit rCOMMc2810872327a: [lib] Re-introduce `RoleInfo` (`[Legacy/MinimallyEncoded]RoleInfo`) (authored by atul). · Explain WhyNov 29 2023, 3:20 PM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMMc2810872327a: [lib] Re-introduce `RoleInfo` (`[Legacy/MinimallyEncoded]RoleInfo`).
atul mentioned this in rCOMM585efacdc7a5: [lib] Re-introduce `RelativeMemberInfo` (`….
atul mentioned this in rCOMMbfd6ef196960: [lib] Reintroduce `RawThreadInfo` (`[Legacy/MinimallyEncoded]RawThreadInfo`).
atul mentioned this in D10095: [lib] `ThreadInfo` -> `LegacyThreadInfo`.Nov 30 2023, 8:31 AM

Revision Contents
Changeset List

PathSize
lib/
shared/
7 lines
types/
7 lines
utils/
10 lines

Diff 34005

View Options

lib/shared/thread-utils.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines
View Options

lib/types/thread-types.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines
View Options

lib/utils/role-utils.js

// @flow // @flow
import { oldValidUsernameRegexString } from './account-utils.js'; import { oldValidUsernameRegexString } from './account-utils.js';
import SentencePrefixSearchIndex from './sentence-prefix-search-index.js'; import SentencePrefixSearchIndex from './sentence-prefix-search-index.js';
import { threadOtherMembers } from './thread-utils.js'; import { threadOtherMembers } from './thread-utils.js';
import { stringForUserExplicit } from './user-utils.js'; import { stringForUserExplicit } from './user-utils.js';
import type { import type {
MinimallyEncodedRelativeMemberInfo, MinimallyEncodedRelativeMemberInfo,
MinimallyEncodedResolvedThreadInfo, MinimallyEncodedResolvedThreadInfo,
MinimallyEncodedThreadInfo, MinimallyEncodedThreadInfo,
} from '../types/minimally-encoded-thread-permissions-types.js'; } from '../types/minimally-encoded-thread-permissions-types.js';
import { threadTypes } from '../types/thread-types-enum.js'; import { threadTypes } from '../types/thread-types-enum.js';
import type { import type {
ThreadInfo, ThreadInfo,
RelativeMemberInfo, LegacyRelativeMemberInfo,
ResolvedThreadInfo, ResolvedThreadInfo,
ChatMentionCandidates, ChatMentionCandidates,
} from '../types/thread-types.js'; } from '../types/thread-types.js';
import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js'; import { idSchemaRegex, chatNameMaxLength } from '../utils/validation-utils.js';
export type TypeaheadMatchedStrings = { export type TypeaheadMatchedStrings = {
+textBeforeAtSymbol: string, +textBeforeAtSymbol: string,
+query: string, +query: string,
}; };
export type Selection = { export type Selection = {
+start: number, +start: number,
+end: number, +end: number,
}; };
type MentionTypeaheadUserSuggestionItem = { type MentionTypeaheadUserSuggestionItem = {
+type: 'user', +type: 'user',
+userInfo: RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, +userInfo: LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
}; };
type MentionTypeaheadChatSuggestionItem = { type MentionTypeaheadChatSuggestionItem = {
+type: 'chat', +type: 'chat',
+threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo, +threadInfo: ResolvedThreadInfo | MinimallyEncodedResolvedThreadInfo,
}; };
export type MentionTypeaheadSuggestionItem = export type MentionTypeaheadSuggestionItem =
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines ) {
return text.slice(0, selection.start).match(regex); return text.slice(0, selection.start).match(regex);
} }
return null; return null;
} }
function getMentionTypeaheadUserSuggestions( function getMentionTypeaheadUserSuggestions(
userSearchIndex: SentencePrefixSearchIndex, userSearchIndex: SentencePrefixSearchIndex,
threadMembers: $ReadOnlyArray< threadMembers: $ReadOnlyArray<
RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo, LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
>, >,
viewerID: ?string, viewerID: ?string,
usernamePrefix: string, usernamePrefix: string,
): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> { ): $ReadOnlyArray<MentionTypeaheadUserSuggestionItem> {
const userIDs = userSearchIndex.getSearchResults(usernamePrefix); const userIDs = userSearchIndex.getSearchResults(usernamePrefix);
const usersInThread = threadOtherMembers(threadMembers, viewerID); const usersInThread = threadOtherMembers(threadMembers, viewerID);
return usersInThread return usersInThread
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): {
const newSelectionStart = newText.length - newSuffixText.length + 1; const newSelectionStart = newText.length - newSuffixText.length + 1;
return { newText, newSelectionStart }; return { newText, newSelectionStart };
} }
function getUserMentionsCandidates( function getUserMentionsCandidates(
threadInfo: ThreadInfo | MinimallyEncodedThreadInfo, threadInfo: ThreadInfo | MinimallyEncodedThreadInfo,
parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo, parentThreadInfo: ?ThreadInfo | ?MinimallyEncodedThreadInfo,
): $ReadOnlyArray<RelativeMemberInfo | MinimallyEncodedRelativeMemberInfo> { ): $ReadOnlyArray<
LegacyRelativeMemberInfo | MinimallyEncodedRelativeMemberInfo,
> {
if (threadInfo.type !== threadTypes.SIDEBAR) { if (threadInfo.type !== threadTypes.SIDEBAR) {
return threadInfo.members; return threadInfo.members;
} }
if (parentThreadInfo) { if (parentThreadInfo) {
return parentThreadInfo.members; return parentThreadInfo.members;
} }
// This scenario should not occur unless the user logs out while looking at a // This scenario should not occur unless the user logs out while looking at a
// sidebar. In that scenario, the Redux store may be cleared before ReactNav // sidebar. In that scenario, the Redux store may be cleared before ReactNav
Show All 19 Lines