Page MenuHomePhabricator
Differential D7651

[keyserver, lib] Add message search endpoint
ClosedPublic
Actions

Authored by inka on Apr 27 2023, 6:15 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 20, 4:03 PM
Unknown Object (File)
Sun, Apr 20, 1:48 PM
Unknown Object (File)
Sun, Apr 20, 11:11 AM
Unknown Object (File)
Sun, Apr 20, 11:07 AM
Unknown Object (File)
Sun, Apr 20, 8:39 AM
Unknown Object (File)
Sun, Apr 20, 6:50 AM
Unknown Object (File)
Sat, Apr 19, 11:29 PM
Unknown Object (File)
Sat, Apr 19, 8:23 PM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
kamil
bartek
• kuba
ashoat
Commits
rCOMM7e7050dee8ae: [keyserver, lib] Add message search endpoint
Summary

issue: https://linear.app/comm/issue/ENG-3170/create-a-keyserver-endpoint-for-the-message-search-within-specific
This endpoint allows searching messages. For now we can only search in one thread. It will have to be changed a bit in the future to be able to search in many threads, but we don't yet know how we will want that to work.

Test Plan

Tested with the next diff

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

inka created this revision.Apr 27 2023, 6:15 AM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptApr 27 2023, 6:15 AM
inka added a parent revision: D7585: [keyserver] Add function for fetching messages matching search query.Apr 27 2023, 6:15 AM
inka added a child revision: D7652: [lib] Allow calling message search from client.Apr 27 2023, 6:23 AM
Harbormaster completed remote builds in B18847: Diff 25816.Apr 27 2023, 6:33 AM
inka requested review of this revision.Apr 27 2023, 6:33 AM
ashoat accepted this revision.Apr 27 2023, 12:43 PM
ashoat added inline comments.
lib/types/message-types.js
697 ↗(On Diff #25816)

Personally I don't think we really need these aliases, we could just use SearchMessagesResponse throughout. I don't feel strongly though

This revision is now accepted and ready to land.Apr 27 2023, 12:43 PM
inka updated this revision to Diff 26033.May 3 2023, 1:01 AM

Remove SearchMessagesResult, rebase

Harbormaster completed remote builds in B19013: Diff 26033.May 3 2023, 1:19 AM
inka updated this revision to Diff 26153.May 8 2023, 1:57 AM

Add endReached to response from message search endpoint

Harbormaster completed remote builds in B19103: Diff 26153.May 8 2023, 2:14 AM
inka updated this revision to Diff 26160.May 8 2023, 2:38 AM

Fix - related messages were being counted to check if the end was reached.

Harbormaster completed remote builds in B19107: Diff 26160.May 8 2023, 2:55 AM
ashoat mentioned this in D7585: [keyserver] Add function for fetching messages matching search query.May 8 2023, 6:41 AM
inka updated this revision to Diff 26275.May 9 2023, 3:17 AM

Rebase

Harbormaster completed remote builds in B19193: Diff 26275.May 9 2023, 3:36 AM
inka updated this revision to Diff 26487.May 16 2023, 1:37 AM

Rebase

Harbormaster completed remote builds in B19356: Diff 26487.May 16 2023, 1:55 AM
Closed by commit rCOMM7e7050dee8ae: [keyserver, lib] Add message search endpoint (authored by • InkaSokolowska). · Explain WhyMay 24 2023, 2:12 AM
This revision was automatically updated to reflect the committed changes.
• InkaSokolowska added a commit: rCOMM7e7050dee8ae: [keyserver, lib] Add message search endpoint.

Revision Contents
Changeset List

PathSize
keyserver/
src/
5 lines
responders/
33 lines
lib/
types/
1 line
11 lines

Diff 26153

View Options

keyserver/src/endpoints.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { fetchPinnedMessages } from 'lib/actions/message-actions.js'; import { fetchPinnedMessages } from 'lib/actions/message-actions.js';
import { messageListData } from 'lib/selectors/chat-selectors.js'; import { messageListData } from 'lib/selectors/chat-selectors.js';
import { createMessageInfo } from 'lib/shared/message-utils.js'; import { createMessageInfo } from 'lib/shared/message-utils.js';
import { isComposableMessageType } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useServerCall } from 'lib/utils/action-utils.js'; import { useServerCall } from 'lib/utils/action-utils.js';
import { useHeightMeasurer } from './chat-context.js'; import { useHeightMeasurer } from './chat-context.js';
import type { ChatNavigationProp } from './chat.react'; import type { ChatNavigationProp } from './chat.react';
import MessageResult from './message-result.react.js'; import MessageResult from './message-result.react.js';
import type { NavigationRoute } from '../navigation/route-names'; import type { NavigationRoute } from '../navigation/route-names';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines const chatMessageInfos = useSelector(
messageListData(threadInfo.id, translatedMessageResults), messageListData(threadInfo.id, translatedMessageResults),
); );
const sortedUniqueChatMessageInfoItems = React.useMemo(() => { const sortedUniqueChatMessageInfoItems = React.useMemo(() => {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return []; return [];
} }
const pinnedMessageIDs = new Set(); const pinnedMessageIDs = new Set();
translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id)); translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id));
inkaUnsubmitted
Not Done
Inline Actions

We could probably go back to using isPinned property here. The thing we undid in D8097. This would make the code more readable, but it's up to you

inka: We could probably go back to using `isPinned` property here. The thing we undid in D8097. This…
const chatMessageInfoItems = chatMessageInfos.filter( const chatMessageInfoItems = chatMessageInfos.filter(
item => item =>
item.itemType === 'message' && item.itemType === 'message' &&
pinnedMessageIDs.has(item.messageInfo.id), pinnedMessageIDs.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
rohanAuthorUnsubmitted
Done
Inline Actions

As mentioned in the description, this is because toggle_pin messages are visible robotext, so if we don't filter those out then they will become visible in the message results modal. This is done here, after the ChatMessageInfos have been created, so we can accurately use the updated fetched related messages to determine the isPinned flag. If we filtered this earlier, then we'd be in the same situation as before

This also is fine because we only allow the user to pin composable message types so we won't exclude anything from the view that we need to show.

rohan: As mentioned in the description, this is because toggle_pin messages are visible robotext, so…
); );
// By the nature of using messageListData and passing in // By the nature of using messageListData and passing in
// the desired translatedMessageResults as additional // the desired translatedMessageResults as additional
// messages, we will have duplicate ChatMessageInfoItems. // messages, we will have duplicate ChatMessageInfoItems.
const uniqueChatMessageInfoItemsMap = new Map(); const uniqueChatMessageInfoItemsMap = new Map();
chatMessageInfoItems.forEach( chatMessageInfoItems.forEach(
item => item =>
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines
View Options

keyserver/src/responders/message-responders.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { fetchPinnedMessages } from 'lib/actions/message-actions.js'; import { fetchPinnedMessages } from 'lib/actions/message-actions.js';
import { messageListData } from 'lib/selectors/chat-selectors.js'; import { messageListData } from 'lib/selectors/chat-selectors.js';
import { createMessageInfo } from 'lib/shared/message-utils.js'; import { createMessageInfo } from 'lib/shared/message-utils.js';
import { isComposableMessageType } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useServerCall } from 'lib/utils/action-utils.js'; import { useServerCall } from 'lib/utils/action-utils.js';
import { useHeightMeasurer } from './chat-context.js'; import { useHeightMeasurer } from './chat-context.js';
import type { ChatNavigationProp } from './chat.react'; import type { ChatNavigationProp } from './chat.react';
import MessageResult from './message-result.react.js'; import MessageResult from './message-result.react.js';
import type { NavigationRoute } from '../navigation/route-names'; import type { NavigationRoute } from '../navigation/route-names';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines const chatMessageInfos = useSelector(
messageListData(threadInfo.id, translatedMessageResults), messageListData(threadInfo.id, translatedMessageResults),
); );
const sortedUniqueChatMessageInfoItems = React.useMemo(() => { const sortedUniqueChatMessageInfoItems = React.useMemo(() => {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return []; return [];
} }
const pinnedMessageIDs = new Set(); const pinnedMessageIDs = new Set();
translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id)); translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id));
inkaUnsubmitted
Not Done
Inline Actions

We could probably go back to using isPinned property here. The thing we undid in D8097. This would make the code more readable, but it's up to you

inka: We could probably go back to using `isPinned` property here. The thing we undid in D8097. This…
const chatMessageInfoItems = chatMessageInfos.filter( const chatMessageInfoItems = chatMessageInfos.filter(
item => item =>
item.itemType === 'message' && item.itemType === 'message' &&
pinnedMessageIDs.has(item.messageInfo.id), pinnedMessageIDs.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
rohanAuthorUnsubmitted
Done
Inline Actions

As mentioned in the description, this is because toggle_pin messages are visible robotext, so if we don't filter those out then they will become visible in the message results modal. This is done here, after the ChatMessageInfos have been created, so we can accurately use the updated fetched related messages to determine the isPinned flag. If we filtered this earlier, then we'd be in the same situation as before

This also is fine because we only allow the user to pin composable message types so we won't exclude anything from the view that we need to show.

rohan: As mentioned in the description, this is because toggle_pin messages are visible robotext, so…
); );
// By the nature of using messageListData and passing in // By the nature of using messageListData and passing in
// the desired translatedMessageResults as additional // the desired translatedMessageResults as additional
// messages, we will have duplicate ChatMessageInfoItems. // messages, we will have duplicate ChatMessageInfoItems.
const uniqueChatMessageInfoItemsMap = new Map(); const uniqueChatMessageInfoItemsMap = new Map();
chatMessageInfoItems.forEach( chatMessageInfoItems.forEach(
item => item =>
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines
View Options

lib/types/endpoints.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { fetchPinnedMessages } from 'lib/actions/message-actions.js'; import { fetchPinnedMessages } from 'lib/actions/message-actions.js';
import { messageListData } from 'lib/selectors/chat-selectors.js'; import { messageListData } from 'lib/selectors/chat-selectors.js';
import { createMessageInfo } from 'lib/shared/message-utils.js'; import { createMessageInfo } from 'lib/shared/message-utils.js';
import { isComposableMessageType } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useServerCall } from 'lib/utils/action-utils.js'; import { useServerCall } from 'lib/utils/action-utils.js';
import { useHeightMeasurer } from './chat-context.js'; import { useHeightMeasurer } from './chat-context.js';
import type { ChatNavigationProp } from './chat.react'; import type { ChatNavigationProp } from './chat.react';
import MessageResult from './message-result.react.js'; import MessageResult from './message-result.react.js';
import type { NavigationRoute } from '../navigation/route-names'; import type { NavigationRoute } from '../navigation/route-names';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines const chatMessageInfos = useSelector(
messageListData(threadInfo.id, translatedMessageResults), messageListData(threadInfo.id, translatedMessageResults),
); );
const sortedUniqueChatMessageInfoItems = React.useMemo(() => { const sortedUniqueChatMessageInfoItems = React.useMemo(() => {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return []; return [];
} }
const pinnedMessageIDs = new Set(); const pinnedMessageIDs = new Set();
translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id)); translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id));
inkaUnsubmitted
Not Done
Inline Actions

We could probably go back to using isPinned property here. The thing we undid in D8097. This would make the code more readable, but it's up to you

inka: We could probably go back to using `isPinned` property here. The thing we undid in D8097. This…
const chatMessageInfoItems = chatMessageInfos.filter( const chatMessageInfoItems = chatMessageInfos.filter(
item => item =>
item.itemType === 'message' && item.itemType === 'message' &&
pinnedMessageIDs.has(item.messageInfo.id), pinnedMessageIDs.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
rohanAuthorUnsubmitted
Done
Inline Actions

As mentioned in the description, this is because toggle_pin messages are visible robotext, so if we don't filter those out then they will become visible in the message results modal. This is done here, after the ChatMessageInfos have been created, so we can accurately use the updated fetched related messages to determine the isPinned flag. If we filtered this earlier, then we'd be in the same situation as before

This also is fine because we only allow the user to pin composable message types so we won't exclude anything from the view that we need to show.

rohan: As mentioned in the description, this is because toggle_pin messages are visible robotext, so…
); );
// By the nature of using messageListData and passing in // By the nature of using messageListData and passing in
// the desired translatedMessageResults as additional // the desired translatedMessageResults as additional
// messages, we will have duplicate ChatMessageInfoItems. // messages, we will have duplicate ChatMessageInfoItems.
const uniqueChatMessageInfoItemsMap = new Map(); const uniqueChatMessageInfoItemsMap = new Map();
chatMessageInfoItems.forEach( chatMessageInfoItems.forEach(
item => item =>
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines
View Options

lib/types/message-types.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { ScrollView } from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import { fetchPinnedMessages } from 'lib/actions/message-actions.js'; import { fetchPinnedMessages } from 'lib/actions/message-actions.js';
import { messageListData } from 'lib/selectors/chat-selectors.js'; import { messageListData } from 'lib/selectors/chat-selectors.js';
import { createMessageInfo } from 'lib/shared/message-utils.js'; import { createMessageInfo } from 'lib/shared/message-utils.js';
import { isComposableMessageType } from 'lib/types/message-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useServerCall } from 'lib/utils/action-utils.js'; import { useServerCall } from 'lib/utils/action-utils.js';
import { useHeightMeasurer } from './chat-context.js'; import { useHeightMeasurer } from './chat-context.js';
import type { ChatNavigationProp } from './chat.react'; import type { ChatNavigationProp } from './chat.react';
import MessageResult from './message-result.react.js'; import MessageResult from './message-result.react.js';
import type { NavigationRoute } from '../navigation/route-names'; import type { NavigationRoute } from '../navigation/route-names';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines const chatMessageInfos = useSelector(
messageListData(threadInfo.id, translatedMessageResults), messageListData(threadInfo.id, translatedMessageResults),
); );
const sortedUniqueChatMessageInfoItems = React.useMemo(() => { const sortedUniqueChatMessageInfoItems = React.useMemo(() => {
if (!chatMessageInfos) { if (!chatMessageInfos) {
return []; return [];
} }
const pinnedMessageIDs = new Set(); const pinnedMessageIDs = new Set();
translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id)); translatedMessageResults.forEach(item => pinnedMessageIDs.add(item.id));
inkaUnsubmitted
Not Done
Inline Actions

We could probably go back to using isPinned property here. The thing we undid in D8097. This would make the code more readable, but it's up to you

inka: We could probably go back to using `isPinned` property here. The thing we undid in D8097. This…
const chatMessageInfoItems = chatMessageInfos.filter( const chatMessageInfoItems = chatMessageInfos.filter(
item => item =>
item.itemType === 'message' && item.itemType === 'message' &&
pinnedMessageIDs.has(item.messageInfo.id), pinnedMessageIDs.has(item.messageInfo.id) &&
isComposableMessageType(item.messageInfo.type),
rohanAuthorUnsubmitted
Done
Inline Actions

As mentioned in the description, this is because toggle_pin messages are visible robotext, so if we don't filter those out then they will become visible in the message results modal. This is done here, after the ChatMessageInfos have been created, so we can accurately use the updated fetched related messages to determine the isPinned flag. If we filtered this earlier, then we'd be in the same situation as before

This also is fine because we only allow the user to pin composable message types so we won't exclude anything from the view that we need to show.

rohan: As mentioned in the description, this is because toggle_pin messages are visible robotext, so…
); );
// By the nature of using messageListData and passing in // By the nature of using messageListData and passing in
// the desired translatedMessageResults as additional // the desired translatedMessageResults as additional
// messages, we will have duplicate ChatMessageInfoItems. // messages, we will have duplicate ChatMessageInfoItems.
const uniqueChatMessageInfoItemsMap = new Map(); const uniqueChatMessageInfoItemsMap = new Map();
chatMessageInfoItems.forEach( chatMessageInfoItems.forEach(
item => item =>
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines