oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

enable back search results on messages content

Browse source
This commit is contained in:
Audric Ackermann 2020-01-07 15:04:31 +11:00
parent 89ba00e213
commit 31b98b71be
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ts/state/ducks/search.ts
View file

@ -3,11 +3,11 @@ import { omit, reject } from 'lodash';
import { normalize } from '../../types/PhoneNumber';
import { SearchOptions } from '../../types/Search';
import { trigger } from '../../shims/events';
// import { getMessageModel } from '../../shims/Whisper';
// import { cleanSearchTerm } from '../../util/cleanSearchTerm';
import { getMessageModel } from '../../shims/Whisper';
import { cleanSearchTerm } from '../../util/cleanSearchTerm';
import {
getPrimaryDeviceFor,
searchConversations /*, searchMessages */,
searchConversations, searchMessages,
} from '../../../js/modules/data';
import { makeLookup } from '../../util/makeLookup';
@ -97,9 +97,9 @@ async function doSearch(
): Promise<SearchResultsPayloadType> {
const { regionCode } = options;
const [discussions /*, messages */] = await Promise.all([
const [discussions, messages] = await Promise.all([
queryConversationsAndContacts(query, options),
// queryMessages(query),
queryMessages(query),
]);
const { conversations, contacts } = discussions;
@ -108,7 +108,7 @@ async function doSearch(
normalizedPhoneNumber: normalize(query, { regionCode }),
conversations,
contacts,
messages: [], // getMessageProps(messages) || [],
messages: getMessageProps(messages) || [],
};
}
function clearSearch(): ClearSearchActionType {
@ -144,27 +144,27 @@ function startNewConversation(
// Helper functions for search
// const getMessageProps = (messages: Array<MessageType>) => {
// if (!messages || !messages.length) {
// return [];
// }
const getMessageProps = (messages: Array<MessageType>) => {
if (!messages || !messages.length) {
return [];
}
// return messages.map(message => {
// const model = getMessageModel(message);
return messages.map(message => {
const model = getMessageModel(message);
// return model.propsForSearchResult;
// });
// };
return model.propsForSearchResult;
});
};
// async function queryMessages(query: string) {
// try {
// const normalized = cleanSearchTerm(query);
async function queryMessages(query: string) {
try {
const normalized = cleanSearchTerm(query);
// return searchMessages(normalized);
// } catch (e) {
// return [];
// }
// }
return searchMessages(normalized);
} catch (e) {
return [];
}
}
async function queryConversationsAndContacts(
providedQuery: string,