OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Searching: Fix some lint issues.

pull/21833/head
Damir Jelić 2020-06-04 12:12:09 +02:00
parent 28f7d23bfc
commit c6462e11ec
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Searching.js
View File

@ -159,7 +159,7 @@ async function localSearch(searchTerm, roomId = undefined, processResult = true)
const result = { const result = {
response: localResult, response: localResult,
query: searchArgs, query: searchArgs,
} };
return result; return result;
} }
@ -291,7 +291,7 @@ function combineResponses(previousSearchResult, localEvents = undefined, serverE
console.log("HELLOO COMBINING RESULTS", localEvents, serverEvents, response); console.log("HELLOO COMBINING RESULTS", localEvents, serverEvents, response);
return response return response;
} }
async function combinedPagination(searchResult) { async function combinedPagination(searchResult) {
@ -307,11 +307,13 @@ async function combinedPagination(searchResult) {
const oldestEventFrom = searchResult.oldestEventFrom; const oldestEventFrom = searchResult.oldestEventFrom;
if ((searchArgs.next_batch && oldestEventFrom === "server") || (!searchResult.serverSideNextBatch && searchArgs.next_batch)) { if ((searchArgs.next_batch && oldestEventFrom === "server") ||
(!searchResult.serverSideNextBatch && searchArgs.next_batch)) {
localResult = await eventIndex.search(searchArgs); localResult = await eventIndex.search(searchArgs);
} }
if ((searchResult.serverSideNextBatch && oldestEventFrom === "local") || (!searchArgs.next_batch && searchResult.serverSideNextBatch)) { if ((searchResult.serverSideNextBatch && oldestEventFrom === "local") ||
(!searchArgs.next_batch && searchResult.serverSideNextBatch)) {
const body = {body: searchResult._query, next_batch: searchResult.serverSideNextBatch}; const body = {body: searchResult._query, next_batch: searchResult.serverSideNextBatch};
serverSideResult = await client.search(body); serverSideResult = await client.search(body);
} }
@ -336,7 +338,7 @@ async function combinedPagination(searchResult) {
searchResult.pendingRequest = null; searchResult.pendingRequest = null;
return result return result;
} }
function eventIndexSearch(term, roomId = undefined) { function eventIndexSearch(term, roomId = undefined) {
@ -378,7 +380,7 @@ function eventIndexSearchPagination(searchResult) {
const promise = combinedPagination(searchResult); const promise = combinedPagination(searchResult);
searchResult.pendingRequest = promise; searchResult.pendingRequest = promise;
return promise return promise;
} }
} }