status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): endless search when user has no chats or communities

This commit is contained in:
Michał Cieślak 2022-07-19 17:15:09 +02:00 committed by Michał
parent 9aa1a1073e
commit d0125c86b5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/modules/main/app_search/controller.nim
View File

@ -127,6 +127,10 @@ proc searchMessages*(self: Controller, searchTerm: string) =
for cId in communitiesIds:
communities.add(cId)
if (communities.len == 0 and chats.len == 0):
self.delegate.onSearchMessagesDone(@[])
return
self.messageService.asyncSearchMessages(communities, chats, self.searchTerm, false)
proc getOneToOneChatNameAndImage*(self: Controller, chatId: string):

6
src/app_service/service/message/service.nim
View File

@ -526,8 +526,8 @@ QtObject:
self.finishAsyncSearchMessagesWithError(chatId, "search messages response doesn't contain messages array")
return
if (messagesArray.kind != JArray):
self.finishAsyncSearchMessagesWithError(chatId, "expected messages json array is not of JArray type")
if (messagesArray.kind notin {JArray, JNull}):
self.finishAsyncSearchMessagesWithError(chatId, "expected messages json array is neither of JArray nor JNull type")
return
var messages = map(messagesArray.getElems(), proc(x: JsonNode): MessageDto = x.toMessageDto())
@ -542,6 +542,7 @@ QtObject:
return
if (searchTerm.len == 0):
error "the searched term cannot be empty", procName="asyncSearchMessages"
return
let arg = AsyncSearchMessagesInChatTaskArg(
@ -564,6 +565,7 @@ QtObject:
return
if (searchTerm.len == 0):
error "the searched term cannot be empty", procName="asyncSearchMessages"
return
let arg = AsyncSearchMessagesInChatsAndCommunitiesTaskArg(