Page MenuHomePhabricator
Differential D12854

[lib] introduce message searching to `SQLiteAPI`
ClosedPublic
Actions

Authored by kamil on Jul 23 2024, 3:10 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 24, 8:48 AM
Unknown Object (File)
Feb 21 2025, 2:55 AM
Unknown Object (File)
Feb 21 2025, 2:54 AM
Unknown Object (File)
Feb 21 2025, 2:53 AM
Unknown Object (File)
Jan 21 2025, 11:20 PM
Unknown Object (File)
Jan 15 2025, 11:37 PM
Unknown Object (File)
Jan 4 2025, 2:25 PM
Unknown Object (File)
Dec 23 2024, 1:19 PM
View All 68 Files
Subscribers
ashoat
inka

Details

Reviewers
tomek
inka
Commits
rCOMM5d535a143135: [lib] introduce message searching to `SQLiteAPI`
Summary

This diff introduces a shared interface on SQLiteAPI so the JS code in lib can use this API on both platforms.

Depends on D12853

Test Plan

Tested later in the stack by @inka.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
types/
6 lines
utils/
__mocks__/
1 line
native/
database/
1 line
web/
database/
19 lines

Diff 42710

View Options

lib/types/sqlite-types.js

Show All 13 Linesimport {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { ENSCacheContext } from '../components/ens-cache-provider.react.js'; import { ENSCacheContext } from '../components/ens-cache-provider.react.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import { useIdentitySearch } from '../identity-search/identity-search-context.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import { useUserSearchIndex } from '../selectors/nav-selectors.js'; import { useUserSearchIndex } from '../selectors/nav-selectors.js';
import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js'; import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js';
import type { User } from '../types/identity-search/search-response-types.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
GlobalAccountUserInfo, GlobalAccountUserInfo,
▲ Show 20 Lines • Show All 328 Lines • ▼ Show 20 Lines void (async () => {
setUsernameToSearch(lowercaseText); setUsernameToSearch(lowercaseText);
} }
})(); })();
}, [ensCache, lowercaseText]); }, [ensCache, lowercaseText]);
return usernameToSearch; return usernameToSearch;
} }
function useSearchIdentityUsers(
usernameInputText: string,
): $ReadOnlyArray<User> {
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const { sendPrefixQuery } = useIdentitySearch();
const [searchResults, setSearchResults] = React.useState(
ashoatUnsubmitted
Not Done
Inline Actions

Same comment here... please move the typehint

ashoat: Same comment here... please move the typehint
ashoatUnsubmitted
Not Done
Inline Actions

Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping responding to the feedback here.

In the future, I'd suggest responding to the feedback, even if it gets removed in a later diff. It saves your diff reviewer from dealing with confusion. If rebasing is a headache right now, that is probably a skill that will get improved over time... eventually, it should be really easy for you to directly address feedback, and not something that you avoid.

Okay to skip it this time I guess

ashoat: Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping…
willAuthorUnsubmitted
Done
Inline Actions

Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback going forward.

will: Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback…
([]: $ReadOnlyArray<User>),
);
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
React.useEffect(() => {
if (forwardLookupSearchText.length === 0) {
setSearchResults([]);
return;
}
void (async () => {
try {
const result = await sendPrefixQuery(forwardLookupSearchText);
setSearchResults(
result.filter(({ userID }) => userID !== currentUserID),
);
} catch (err) {
console.error(err);
setSearchResults([]);
}
})();
}, [currentUserID, forwardLookupSearchText, sendPrefixQuery]);
return searchResults;
}
function useSearchUsers( function useSearchUsers(
usernameInputText: string, usernameInputText: string,
): $ReadOnlyArray<GlobalAccountUserInfo> { ): $ReadOnlyArray<GlobalAccountUserInfo> {
const currentUserID = useSelector( const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id, state => state.currentUserInfo && state.currentUserInfo.id,
); );
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText); const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines): ?(ChatMessageInfoItem[]) {
return sortedChatMessageInfoItems; return sortedChatMessageInfoItems;
} }
export { export {
usePotentialMemberItems, usePotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
useSearchIdentityUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
useForwardLookupSearchText, useForwardLookupSearchText,
}; };
View Options

lib/utils/__mocks__/config.js

Show All 13 Linesimport {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { ENSCacheContext } from '../components/ens-cache-provider.react.js'; import { ENSCacheContext } from '../components/ens-cache-provider.react.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import { useIdentitySearch } from '../identity-search/identity-search-context.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import { useUserSearchIndex } from '../selectors/nav-selectors.js'; import { useUserSearchIndex } from '../selectors/nav-selectors.js';
import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js'; import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js';
import type { User } from '../types/identity-search/search-response-types.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
GlobalAccountUserInfo, GlobalAccountUserInfo,
▲ Show 20 Lines • Show All 328 Lines • ▼ Show 20 Lines void (async () => {
setUsernameToSearch(lowercaseText); setUsernameToSearch(lowercaseText);
} }
})(); })();
}, [ensCache, lowercaseText]); }, [ensCache, lowercaseText]);
return usernameToSearch; return usernameToSearch;
} }
function useSearchIdentityUsers(
usernameInputText: string,
): $ReadOnlyArray<User> {
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const { sendPrefixQuery } = useIdentitySearch();
const [searchResults, setSearchResults] = React.useState(
ashoatUnsubmitted
Not Done
Inline Actions

Same comment here... please move the typehint

ashoat: Same comment here... please move the typehint
ashoatUnsubmitted
Not Done
Inline Actions

Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping responding to the feedback here.

In the future, I'd suggest responding to the feedback, even if it gets removed in a later diff. It saves your diff reviewer from dealing with confusion. If rebasing is a headache right now, that is probably a skill that will get improved over time... eventually, it should be really easy for you to directly address feedback, and not something that you avoid.

Okay to skip it this time I guess

ashoat: Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping…
willAuthorUnsubmitted
Done
Inline Actions

Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback going forward.

will: Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback…
([]: $ReadOnlyArray<User>),
);
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
React.useEffect(() => {
if (forwardLookupSearchText.length === 0) {
setSearchResults([]);
return;
}
void (async () => {
try {
const result = await sendPrefixQuery(forwardLookupSearchText);
setSearchResults(
result.filter(({ userID }) => userID !== currentUserID),
);
} catch (err) {
console.error(err);
setSearchResults([]);
}
})();
}, [currentUserID, forwardLookupSearchText, sendPrefixQuery]);
return searchResults;
}
function useSearchUsers( function useSearchUsers(
usernameInputText: string, usernameInputText: string,
): $ReadOnlyArray<GlobalAccountUserInfo> { ): $ReadOnlyArray<GlobalAccountUserInfo> {
const currentUserID = useSelector( const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id, state => state.currentUserInfo && state.currentUserInfo.id,
); );
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText); const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines): ?(ChatMessageInfoItem[]) {
return sortedChatMessageInfoItems; return sortedChatMessageInfoItems;
} }
export { export {
usePotentialMemberItems, usePotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
useSearchIdentityUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
useForwardLookupSearchText, useForwardLookupSearchText,
}; };
View Options

native/database/sqlite-api.js

Show All 13 Linesimport {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { ENSCacheContext } from '../components/ens-cache-provider.react.js'; import { ENSCacheContext } from '../components/ens-cache-provider.react.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import { useIdentitySearch } from '../identity-search/identity-search-context.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import { useUserSearchIndex } from '../selectors/nav-selectors.js'; import { useUserSearchIndex } from '../selectors/nav-selectors.js';
import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js'; import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js';
import type { User } from '../types/identity-search/search-response-types.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
GlobalAccountUserInfo, GlobalAccountUserInfo,
▲ Show 20 Lines • Show All 328 Lines • ▼ Show 20 Lines void (async () => {
setUsernameToSearch(lowercaseText); setUsernameToSearch(lowercaseText);
} }
})(); })();
}, [ensCache, lowercaseText]); }, [ensCache, lowercaseText]);
return usernameToSearch; return usernameToSearch;
} }
function useSearchIdentityUsers(
usernameInputText: string,
): $ReadOnlyArray<User> {
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const { sendPrefixQuery } = useIdentitySearch();
const [searchResults, setSearchResults] = React.useState(
ashoatUnsubmitted
Not Done
Inline Actions

Same comment here... please move the typehint

ashoat: Same comment here... please move the typehint
ashoatUnsubmitted
Not Done
Inline Actions

Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping responding to the feedback here.

In the future, I'd suggest responding to the feedback, even if it gets removed in a later diff. It saves your diff reviewer from dealing with confusion. If rebasing is a headache right now, that is probably a skill that will get improved over time... eventually, it should be really easy for you to directly address feedback, and not something that you avoid.

Okay to skip it this time I guess

ashoat: Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping…
willAuthorUnsubmitted
Done
Inline Actions

Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback going forward.

will: Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback…
([]: $ReadOnlyArray<User>),
);
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
React.useEffect(() => {
if (forwardLookupSearchText.length === 0) {
setSearchResults([]);
return;
}
void (async () => {
try {
const result = await sendPrefixQuery(forwardLookupSearchText);
setSearchResults(
result.filter(({ userID }) => userID !== currentUserID),
);
} catch (err) {
console.error(err);
setSearchResults([]);
}
})();
}, [currentUserID, forwardLookupSearchText, sendPrefixQuery]);
return searchResults;
}
function useSearchUsers( function useSearchUsers(
usernameInputText: string, usernameInputText: string,
): $ReadOnlyArray<GlobalAccountUserInfo> { ): $ReadOnlyArray<GlobalAccountUserInfo> {
const currentUserID = useSelector( const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id, state => state.currentUserInfo && state.currentUserInfo.id,
); );
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText); const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines): ?(ChatMessageInfoItem[]) {
return sortedChatMessageInfoItems; return sortedChatMessageInfoItems;
} }
export { export {
usePotentialMemberItems, usePotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
useSearchIdentityUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
useForwardLookupSearchText, useForwardLookupSearchText,
}; };
View Options

web/database/sqlite-api.js

Show All 13 Linesimport {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { ENSCacheContext } from '../components/ens-cache-provider.react.js'; import { ENSCacheContext } from '../components/ens-cache-provider.react.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import { useIdentitySearch } from '../identity-search/identity-search-context.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import { useUserSearchIndex } from '../selectors/nav-selectors.js'; import { useUserSearchIndex } from '../selectors/nav-selectors.js';
import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js'; import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js';
import type { User } from '../types/identity-search/search-response-types.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
GlobalAccountUserInfo, GlobalAccountUserInfo,
▲ Show 20 Lines • Show All 328 Lines • ▼ Show 20 Lines void (async () => {
setUsernameToSearch(lowercaseText); setUsernameToSearch(lowercaseText);
} }
})(); })();
}, [ensCache, lowercaseText]); }, [ensCache, lowercaseText]);
return usernameToSearch; return usernameToSearch;
} }
function useSearchIdentityUsers(
usernameInputText: string,
): $ReadOnlyArray<User> {
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const { sendPrefixQuery } = useIdentitySearch();
const [searchResults, setSearchResults] = React.useState(
ashoatUnsubmitted
Not Done
Inline Actions

Same comment here... please move the typehint

ashoat: Same comment here... please move the typehint
ashoatUnsubmitted
Not Done
Inline Actions

Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping responding to the feedback here.

In the future, I'd suggest responding to the feedback, even if it gets removed in a later diff. It saves your diff reviewer from dealing with confusion. If rebasing is a headache right now, that is probably a skill that will get improved over time... eventually, it should be really easy for you to directly address feedback, and not something that you avoid.

Okay to skip it this time I guess

ashoat: Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping…
willAuthorUnsubmitted
Done
Inline Actions

Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback going forward.

will: Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback…
([]: $ReadOnlyArray<User>),
);
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
React.useEffect(() => {
if (forwardLookupSearchText.length === 0) {
setSearchResults([]);
return;
}
void (async () => {
try {
const result = await sendPrefixQuery(forwardLookupSearchText);
setSearchResults(
result.filter(({ userID }) => userID !== currentUserID),
);
} catch (err) {
console.error(err);
setSearchResults([]);
}
})();
}, [currentUserID, forwardLookupSearchText, sendPrefixQuery]);
return searchResults;
}
function useSearchUsers( function useSearchUsers(
usernameInputText: string, usernameInputText: string,
): $ReadOnlyArray<GlobalAccountUserInfo> { ): $ReadOnlyArray<GlobalAccountUserInfo> {
const currentUserID = useSelector( const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id, state => state.currentUserInfo && state.currentUserInfo.id,
); );
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText); const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines): ?(ChatMessageInfoItem[]) {
return sortedChatMessageInfoItems; return sortedChatMessageInfoItems;
} }
export { export {
usePotentialMemberItems, usePotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
useSearchIdentityUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
useForwardLookupSearchText, useForwardLookupSearchText,
}; };