refactor(@desktop/chat): loading messages on join public chat

- received new messages are now filtered by the chat id they belong to
- mailserver actions are added to the log
This commit is contained in:
Sale Djenic 2022-01-11 12:35:05 +01:00
parent 4d042f80aa
commit 051142cf3b
5 changed files with 42 additions and 14 deletions

View File

@ -57,4 +57,3 @@ when isMainModule:
var args = ReadyArgs(a)
echo args.text, ": from [2nd] handler"
evts.emit("ready", ReadyArgs(text:"Hello, World"))
evts.emit("ready", ReadyArgs(text:"Hello, World"))

View File

@ -51,7 +51,7 @@ method delete*(self: Controller) =
method init*(self: Controller) =
self.events.on(SIGNAL_MESSAGES_LOADED) do(e:Args):
let args = MessagesLoadedArgs(e)
if(self.chatId != args.chatId):
if(self.chatId != args.chatId or args.pinnedMessages.len == 0):
return
self.delegate.newPinnedMessagesLoaded(args.pinnedMessages)

View File

@ -52,8 +52,10 @@ method init*(self: Controller) =
self.delegate.newMessagesLoaded(args.messages, args.reactions, args.pinnedMessages)
self.events.on(SIGNAL_NEW_MESSAGE_RECEIVED) do(e: Args):
var evArgs = MessagesArgs(e)
for message in evArgs.messages:
var args = MessagesArgs(e)
if(self.chatId != args.chatId):
return
for message in args.messages:
self.delegate.messageAdded(message)
self.events.on(SIGNAL_SENDING_SUCCESS) do(e:Args):

View File

@ -1,6 +1,7 @@
import NimQml, Tables, json, sequtils, strutils, system, uuids, chronicles
import ./dto/mailserver as mailserver_dto
import ../../../app/core/signals/types
import ../../../app/core/fleets/fleet_configuration
import ../../../app/core/[main]
import ../../../app/core/tasks/marathon/mailserver/events
@ -56,10 +57,26 @@ QtObject:
self.events.on("mailserver:changed") do(e: Args):
let receivedData = MailserverArgs(e)
let peer = receivedData.peer
debug "Mailserver changed to ", peer
info "mailserver changed to ", peer
let data = ActiveMailserverChangedArgs(nodeAddress: peer)
self.events.emit(SIGNAL_ACTIVE_MAILSERVER_CHANGED, data)
self.events.on(SignalType.HistoryRequestStarted.event) do(e: Args):
let h = HistoryRequestStartedSignal(e)
info "history request started", requestId=h.requestId, numBatches=h.numBatches
self.events.on(SignalType.HistoryRequestBatchProcessed.event) do(e: Args):
let h = HistoryRequestBatchProcessedSignal(e)
info "history batch processed", requestId=h.requestId, batchIndex=h.batchIndex
self.events.on(SignalType.HistoryRequestCompleted.event) do(e: Args):
let h = HistoryRequestCompletedSignal(e)
info "history request completed", requestId=h.requestId
self.events.on(SignalType.HistoryRequestFailed.event) do(e: Args):
let h = HistoryRequestFailedSignal(e)
info "history request failed", requestId=h.requestId, errorMessage=h.errorMessage
proc initMailservers(self: Service) =
let wakuVersion = self.nodeConfigurationService.getWakuVersion()
let isWakuV2 = wakuVersion == WAKU_VERSION_2

View File

@ -8,6 +8,7 @@ import status/statusgo_backend_new/messages as status_go
import ./dto/message as message_dto
import ./dto/pinned_message as pinned_msg_dto
import ./dto/reaction as reaction_dto
import ../chat/dto/chat as chat_dto
export message_dto
export pinned_msg_dto
@ -33,6 +34,7 @@ include async_tasks
type
MessagesArgs* = ref object of Args
chatId*: string
messages*: seq[MessageDto]
MessagesLoadedArgs* = ref object of Args
@ -85,8 +87,13 @@ QtObject:
var receivedData = MessageSignal(e)
# Handling messages updates
if (receivedData.messages.len > 0):
self.events.emit(SIGNAL_NEW_MESSAGE_RECEIVED, MessagesArgs(messages: receivedData.messages))
if (receivedData.messages.len > 0 and receivedData.chats.len > 0):
# We included `chats` in this condition cause that's the form how `status-go` sends updates.
# The first element from the `receivedData.chats` array contains details about the chat a messages received in
# `receivedData.messages` refer to.
let chatId = receivedData.chats[0].id
let data = MessagesArgs(chatId: chatId, messages: receivedData.messages)
self.events.emit(SIGNAL_NEW_MESSAGE_RECEIVED, data)
# Handling pinned messages updates
if (receivedData.pinnedMessages.len > 0):
for pm in receivedData.pinnedMessages:
@ -299,33 +306,36 @@ QtObject:
result.error = e.msg
error "error: ", methodName="getDetailsForMessage", errName = e.name, errDesription = e.msg
proc finishAsyncSearchMessagesWithError*(self: Service, errorMessage: string) =
proc finishAsyncSearchMessagesWithError*(self: Service, chatId, errorMessage: string) =
error "error: ", methodName="onAsyncSearchMessages", errDescription = errorMessage
self.events.emit(SIGNAL_SEARCH_MESSAGES_LOADED, MessagesArgs())
self.events.emit(SIGNAL_SEARCH_MESSAGES_LOADED, MessagesArgs(chatId: chatId))
proc onAsyncSearchMessages*(self: Service, response: string) {.slot.} =
let responseObj = response.parseJson
if (responseObj.kind != JObject):
self.finishAsyncSearchMessagesWithError("search messages response is not an json object")
self.finishAsyncSearchMessagesWithError("", "search messages response is not an json object")
return
var chatId: string
discard responseObj.getProp("chatId", chatId)
var messagesObj: JsonNode
if (not responseObj.getProp("messages", messagesObj)):
self.finishAsyncSearchMessagesWithError("search messages response doesn't contain messages property")
self.finishAsyncSearchMessagesWithError(chatId, "search messages response doesn't contain messages property")
return
var messagesArray: JsonNode
if (not messagesObj.getProp("messages", messagesArray)):
self.finishAsyncSearchMessagesWithError("search messages response doesn't contain messages array")
self.finishAsyncSearchMessagesWithError(chatId, "search messages response doesn't contain messages array")
return
if (messagesArray.kind != JArray):
self.finishAsyncSearchMessagesWithError("expected messages json array is not of JArray type")
self.finishAsyncSearchMessagesWithError(chatId, "expected messages json array is not of JArray type")
return
var messages = map(messagesArray.getElems(), proc(x: JsonNode): MessageDto = x.toMessageDto())
let data = MessagesArgs(messages: messages)
let data = MessagesArgs(chatId: chatId, messages: messages)
self.events.emit(SIGNAL_SEARCH_MESSAGES_LOADED, data)
proc asyncSearchMessages*(self: Service, chatId: string, searchTerm: string, caseSensitive: bool) =