From c11a96ad01672f0358733e8d49575662833db6f1 Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Fri, 6 Mar 2020 17:43:00 +0100 Subject: [PATCH] lint --- ts/state/ducks/search.ts | 50 ++++++++++++++++++++++++++++------------ ts/types/Search.ts | 8 +++---- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/ts/state/ducks/search.ts b/ts/state/ducks/search.ts index d44fc4503..b965c0dc3 100644 --- a/ts/state/ducks/search.ts +++ b/ts/state/ducks/search.ts @@ -104,19 +104,29 @@ async function doSearch( const [discussions, messages] = await Promise.all([ queryConversationsAndContacts(processedQuery, options), - queryMessages(processedQuery) + queryMessages(processedQuery), ]); const { conversations, contacts } = discussions; let filteredMessages = messages.filter(message => message !== undefined); if (isAdvancedQuery) { let senderFilter: string[] = []; - if (advancedSearchOptions['from'] !== null && advancedSearchOptions['from'].length > 0) { - const senderFilterQuery = await queryConversationsAndContacts(advancedSearchOptions['from'], options); + if ( + advancedSearchOptions['from'] !== null && + advancedSearchOptions['from'].length > 0 + ) { + const senderFilterQuery = await queryConversationsAndContacts( + advancedSearchOptions['from'], + options + ); senderFilter = senderFilterQuery.contacts; console.log(senderFilter); } - filteredMessages = filterMessages(filteredMessages, advancedSearchOptions, senderFilter); + filteredMessages = filterMessages( + filteredMessages, + advancedSearchOptions, + senderFilter + ); console.log(filteredMessages); console.log(advancedSearchOptions); } @@ -162,14 +172,18 @@ function startNewConversation( // Helper functions for search -function filterMessages(messages: any[], filters: AdvancedSearchOptions, contacts: string[]) { +function filterMessages( + messages: any[], + filters: AdvancedSearchOptions, + contacts: string[] +) { let filteredMessages = messages; if (filters['from'] !== null && filters['from'].length > 0) { if (filters['from'] === '@me') { filteredMessages = filteredMessages.filter(message => message.sent); } else { filteredMessages = []; - for(let contact of contacts) { + for (let contact of contacts) { for (const message of messages) { if (message.source === contact) { filteredMessages.push(message); @@ -179,14 +193,18 @@ function filterMessages(messages: any[], filters: AdvancedSearchOptions, contact } } if (filters['before'] > 0) { - filteredMessages = filteredMessages.filter(message => message.received_at < filters['before']); + filteredMessages = filteredMessages.filter( + message => message.received_at < filters['before'] + ); } if (filters['after'] > 0) { - filteredMessages = filteredMessages.filter(message => message.received_at > filters['after']); + filteredMessages = filteredMessages.filter( + message => message.received_at > filters['after'] + ); } return filteredMessages; -}; +} function getUnixTimestampParameter(timestamp: string): number { if (!isNaN(parseInt(timestamp))) { @@ -197,22 +215,24 @@ function getUnixTimestampParameter(timestamp: string): number { } } -function getAdvancedSearchOptionsFromQuery(query: string): AdvancedSearchOptions { +function getAdvancedSearchOptionsFromQuery( + query: string +): AdvancedSearchOptions { const filterSeperator = ':'; const filters: any = { query: null, from: null, before: null, - after: null + after: null, }; let newQuery = query; const splitQuery = query.toLowerCase().split(' '); const filtersList = Object.keys(filters); - for(let queryPart of splitQuery) { - for(let filter of filtersList) { + for (let queryPart of splitQuery) { + for (let filter of filtersList) { const filterMatcher = filter + filterSeperator; - if(queryPart.startsWith(filterMatcher)) { + if (queryPart.startsWith(filterMatcher)) { filters[filter] = queryPart.replace(filterMatcher, ''); newQuery = newQuery.replace(queryPart, '').trim(); } @@ -223,7 +243,7 @@ function getAdvancedSearchOptionsFromQuery(query: string): AdvancedSearchOptions filters['after'] = getUnixTimestampParameter(filters['after']); filters['query'] = newQuery; return filters; -}; +} const getMessageProps = (messages: Array) => { if (!messages || !messages.length) { diff --git a/ts/types/Search.ts b/ts/types/Search.ts index 22cd091cb..990372434 100644 --- a/ts/types/Search.ts +++ b/ts/types/Search.ts @@ -6,8 +6,8 @@ export type SearchOptions = { }; export type AdvancedSearchOptions = { - query: string; - from: string; - before: number; + query: string; + from: string; + before: number; after: number; -}; \ No newline at end of file +};