Page MenuHomePhorge
Files F33031237

D13489.1768403104.diff
No OneTemporary
Actions

Size
9 KB
Referenced Files
None
Subscribers
None

D13489.1768403104.diff
View Options

diff --git a/lib/hooks/thread-search-hooks.js b/lib/hooks/thread-search-hooks.js
--- a/lib/hooks/thread-search-hooks.js
+++ b/lib/hooks/thread-search-hooks.js
@@ -10,13 +10,19 @@
useForwardLookupSearchText,
useSearchUsers,
} from '../shared/search-utils.js';
+import { useUserSupportThickThread } from '../shared/thread-utils.js';
import type { GlobalAccountUserInfo } from '../types/user-types.js';
import { useSelector } from '../utils/redux-utils.js';
import { usingCommServicesAccessToken } from '../utils/services-utils.js';
+export type UserSearchResult = $ReadOnly<{
+ ...GlobalAccountUserInfo,
+ +supportThickThreads: boolean,
+}>;
+
type ThreadListSearchResult = {
+threadSearchResults: $ReadOnlySet<string>,
- +usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,
+ +usersSearchResults: $ReadOnlyArray<UserSearchResult>,
};
function useThreadListSearch(
@@ -27,7 +33,7 @@
const forwardLookupSearchText = useForwardLookupSearchText(searchText);
const filterAndSetUserResults = React.useCallback(
- (userInfos: $ReadOnlyArray<GlobalAccountUserInfo>) => {
+ (userInfos: $ReadOnlyArray<UserSearchResult>) => {
const usersResults = userInfos.filter(
info => !usersWithPersonalThread.has(info.id) && info.id !== viewerID,
);
@@ -45,7 +51,12 @@
}
const { userInfos } = await legacyCallSearchUsers(usernamePrefix);
- filterAndSetUserResults(userInfos);
+ filterAndSetUserResults(
+ userInfos.map(userInfo => ({
+ ...userInfo,
+ supportThickThreads: false,
+ })),
+ );
},
[filterAndSetUserResults, legacyCallSearchUsers],
);
@@ -54,7 +65,7 @@
new Set<string>(),
);
const [usersSearchResults, setUsersSearchResults] = React.useState<
- $ReadOnlyArray<GlobalAccountUserInfo>,
+ $ReadOnlyArray<UserSearchResult>,
>([]);
const threadSearchIndex = useGlobalThreadSearchIndex();
React.useEffect(() => {
@@ -72,12 +83,24 @@
legacySearchUsers,
]);
+ const usersSupportsThickThreads = useUserSupportThickThread();
const identitySearchUsers = useSearchUsers(forwardLookupSearchText);
React.useEffect(() => {
- if (usingCommServicesAccessToken) {
- filterAndSetUserResults(identitySearchUsers);
- }
- }, [filterAndSetUserResults, identitySearchUsers]);
+ void (async () => {
+ if (usingCommServicesAccessToken) {
+ const userIDsSupportingThickThreads = await usersSupportsThickThreads(
+ identitySearchUsers.map(user => user.id),
+ );
+ const set = new Set<string>(userIDsSupportingThickThreads);
+ filterAndSetUserResults(
+ identitySearchUsers.map(search => ({
+ ...search,
+ supportThickThreads: set.has(search.id),
+ })),
+ );
+ }
+ })();
+ }, [filterAndSetUserResults, identitySearchUsers, usersSupportsThickThreads]);
return { threadSearchResults, usersSearchResults };
}
diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -12,10 +12,12 @@
import { generatePendingThreadColor } from './color-utils.js';
import { extractUserMentionsFromText } from './mention-utils.js';
import { relationshipBlockedInEitherDirection } from './relationship-utils.js';
+import { useFindUserIdentities } from '../actions/user-actions.js';
import ashoat from '../facts/ashoat.js';
import genesis from '../facts/genesis.js';
import { useLoggedInUserInfo } from '../hooks/account-hooks.js';
import { useAllowOlmViaTunnelbrokerForDMs } from '../hooks/flag-hooks.js';
+import { type UserSearchResult } from '../hooks/thread-search-hooks.js';
import { extractKeyserverIDFromIDOptional } from '../keyserver-conn/keyserver-call-utils.js';
import {
hasPermission,
@@ -602,14 +604,14 @@
loggedInUserInfo: LoggedInUserInfo,
userID: string,
username: ?string,
- allowOlmViaTunnelbrokerForDMs: boolean,
+ supportThickThreads: boolean,
): PendingPersonalThread {
const pendingPersonalThreadUserInfo = {
id: userID,
username: username,
};
- const threadType = allowOlmViaTunnelbrokerForDMs
+ const threadType = supportThickThreads
? threadTypes.PERSONAL
: threadTypes.GENESIS_PERSONAL;
@@ -625,14 +627,14 @@
function createPendingThreadItem(
loggedInUserInfo: LoggedInUserInfo,
user: UserIDAndUsername,
- allowOlmViaTunnelbrokerForDMs: boolean,
+ supportThickThreads: boolean,
): ChatThreadItem {
const { threadInfo, pendingPersonalThreadUserInfo } =
createPendingPersonalThread(
loggedInUserInfo,
user.id,
user.username,
- allowOlmViaTunnelbrokerForDMs,
+ supportThickThreads,
);
return {
@@ -1438,9 +1440,8 @@
searchText: string,
threadFilter: ThreadInfo => boolean,
threadSearchResults: $ReadOnlySet<string>,
- usersSearchResults: $ReadOnlyArray<GlobalAccountUserInfo>,
+ usersSearchResults: $ReadOnlyArray<UserSearchResult>,
loggedInUserInfo: ?LoggedInUserInfo,
- allowOlmViaTunnelbrokerForDMs: boolean,
): $ReadOnlyArray<ChatThreadItem> {
if (!searchText) {
return chatListData.filter(
@@ -1476,7 +1477,7 @@
createPendingThreadItem(
loggedInUserInfo,
user,
- allowOlmViaTunnelbrokerForDMs,
+ user.supportThickThreads,
),
),
);
@@ -1710,7 +1711,19 @@
const usersWithPersonalThread = useSelector(usersWithPersonalThreadSelector);
- const allowOlmViaTunnelbrokerForDMs = useAllowOlmViaTunnelbrokerForDMs();
+ const [supportThickThreads, setSupportThickThreads] = React.useState(false);
+ const usersSupportsThickThreads = useUserSupportThickThread();
+
+ React.useEffect(() => {
+ void (async () => {
+ if (!userInfo) {
+ setSupportThickThreads(false);
+ return;
+ }
+ const [result] = await usersSupportsThickThreads([userInfo.id]);
+ setSupportThickThreads(!!result);
+ })();
+ }, [userInfo, usersSupportsThickThreads]);
return React.useMemo(() => {
if (!loggedInUserInfo || !userID || !username) {
@@ -1736,16 +1749,16 @@
loggedInUserInfo,
userID,
username,
- allowOlmViaTunnelbrokerForDMs,
+ supportThickThreads,
);
return pendingPersonalThreadInfo;
}, [
- allowOlmViaTunnelbrokerForDMs,
isViewerProfile,
loggedInUserInfo,
personalThreadInfos,
privateThreadInfos,
+ supportThickThreads,
userID,
username,
usersWithPersonalThread,
@@ -1806,6 +1819,41 @@
);
}
+function useUserSupportThickThread(): (
+ userIDs: $ReadOnlyArray<string>,
+) => Promise<$ReadOnlyArray<string>> {
+ const findUserIdentities = useFindUserIdentities();
+ const auxUserInfos = useSelector(state => state.auxUserStore.auxUserInfos);
+ const allowOlmViaTunnelbrokerForDMs = useAllowOlmViaTunnelbrokerForDMs();
+
+ return React.useCallback(
+ async (userIDs: $ReadOnlyArray<string>) => {
+ if (!allowOlmViaTunnelbrokerForDMs) {
+ return [];
+ }
+ const usersSupportingThickThreads = [];
+ const usersNeedsFetch = [];
+ for (const userID of userIDs) {
+ if (userHasDeviceList(userID, auxUserInfos)) {
+ usersSupportingThickThreads.push(userID);
+ } else {
+ usersNeedsFetch.push(userID);
+ }
+ }
+ if (usersNeedsFetch.length > 0) {
+ const { identities } = await findUserIdentities(usersNeedsFetch);
+ for (const userID of usersNeedsFetch) {
+ if (identities[userID]) {
+ usersSupportingThickThreads.push(userID);
+ }
+ }
+ }
+ return usersSupportingThickThreads;
+ },
+ [allowOlmViaTunnelbrokerForDMs, auxUserInfos, findUserIdentities],
+ );
+}
+
export {
threadHasPermission,
useCommunityRootMembersToRole,
@@ -1873,4 +1921,5 @@
isMemberActive,
createThreadTimestamps,
userHasDeviceList,
+ useUserSupportThickThread,
};
diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js
--- a/native/chat/chat-thread-list.react.js
+++ b/native/chat/chat-thread-list.react.js
@@ -279,8 +279,6 @@
],
);
- const allowOlmViaTunnelbrokerForDMs = useAllowOlmViaTunnelbrokerForDMs();
-
const listData: $ReadOnlyArray<Item> = React.useMemo(() => {
const chatThreadItems = getThreadListSearchResults(
boundChatListData,
@@ -289,7 +287,6 @@
threadSearchResults,
usersSearchResults,
loggedInUserInfo,
- allowOlmViaTunnelbrokerForDMs,
);
const chatItems: Item[] = [...chatThreadItems];
@@ -304,7 +301,6 @@
return chatItems;
}, [
- allowOlmViaTunnelbrokerForDMs,
boundChatListData,
emptyItem,
filterThreads,
diff --git a/web/chat/thread-list-provider.js b/web/chat/thread-list-provider.js
--- a/web/chat/thread-list-provider.js
+++ b/web/chat/thread-list-provider.js
@@ -4,7 +4,6 @@
import * as React from 'react';
import { useLoggedInUserInfo } from 'lib/hooks/account-hooks.js';
-import { useAllowOlmViaTunnelbrokerForDMs } from 'lib/hooks/flag-hooks.js';
import { useThreadListSearch } from 'lib/hooks/thread-search-hooks.js';
import {
type ChatThreadItem,
@@ -180,7 +179,6 @@
);
const threadFilter =
activeTab === 'Muted' ? threadInBackgroundChatList : threadInHomeChatList;
- const allowOlmViaTunnelbrokerForDMs = useAllowOlmViaTunnelbrokerForDMs();
const chatListDataWithoutFilter = getThreadListSearchResults(
chatListData,
searchText,
@@ -188,7 +186,6 @@
threadSearchResults,
usersSearchResults,
loggedInUserInfo,
- allowOlmViaTunnelbrokerForDMs,
);
const activeTopLevelChatThreadItem = useChatThreadItem(
activeTopLevelThreadInfo,

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 14, 3:05 PM (14 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5932617
Default Alt Text
D13489.1768403104.diff (9 KB)

Event Timeline