From 40155411dbc1d0ac3780e8a148a7137839ee8d35 Mon Sep 17 00:00:00 2001
From: Bruno Muniz Azevedo Filho <bruno@elixxir.io>
Date: Mon, 27 Jun 2022 00:43:40 -0300
Subject: [PATCH] Fixed issue w/ payload
---
.../ChatFeature/ViewModels/SingleChatViewModel.swift | 4 ++--
Sources/Integration/Session/Session+Chat.swift | 10 +++++++++-
Sources/Integration/Session/Session+Group.swift | 10 +++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Sources/ChatFeature/ViewModels/SingleChatViewModel.swift b/Sources/ChatFeature/ViewModels/SingleChatViewModel.swift
index 860e084b..cd787659 100644
--- a/Sources/ChatFeature/ViewModels/SingleChatViewModel.swift
+++ b/Sources/ChatFeature/ViewModels/SingleChatViewModel.swift
@@ -204,10 +204,10 @@ final class SingleChatViewModel {
}
guard let contact = try? session.dbManager.fetchContacts(.init(id: [message.senderId])).first else {
- return ("You", message.text)
+ fatalError()
}
- let contactTitle = (contact.nickname ?? contact.username) ?? "Fetching username..."
+ let contactTitle = (contact.nickname ?? contact.username) ?? "You"
return (contactTitle, message.text)
}
diff --git a/Sources/Integration/Session/Session+Chat.swift b/Sources/Integration/Session/Session+Chat.swift
index ec582ff8..a0835167 100644
--- a/Sources/Integration/Session/Session+Chat.swift
+++ b/Sources/Integration/Session/Session+Chat.swift
@@ -115,9 +115,17 @@ extension Session {
private func send(message: Message) {
var message = message
+ var reply: Reply?
+ if let replyId = message.replyMessageId,
+ let replyMessage = try? dbManager.fetchMessages(Message.Query(networkId: replyId)).first {
+ reply = Reply(messageId: replyId, senderId: replyMessage.senderId)
+ }
+
+ let payloadData = Payload(text: message.text, reply: reply).asData()
+
DispatchQueue.global().async { [weak self] in
guard let self = self else { return }
- switch self.client.bindings.send(message.text.data(using: .utf8)!, to: message.recipientId!) {
+ switch self.client.bindings.send(payloadData, to: message.recipientId!) {
case .success(let report):
message.roundURL = report.roundURL
diff --git a/Sources/Integration/Session/Session+Group.swift b/Sources/Integration/Session/Session+Group.swift
index 9a37e4b8..0275c854 100644
--- a/Sources/Integration/Session/Session+Group.swift
+++ b/Sources/Integration/Session/Session+Group.swift
@@ -116,10 +116,18 @@ extension Session {
guard let manager = client.groupManager else { fatalError("A group manager was not created") }
var message = message
+ var reply: Reply?
+ if let replyId = message.replyMessageId,
+ let replyMessage = try? dbManager.fetchMessages(Message.Query(networkId: replyId)).first {
+ reply = Reply(messageId: replyId, senderId: replyMessage.senderId)
+ }
+
+ let payloadData = Payload(text: message.text, reply: reply).asData()
+
DispatchQueue.global().async { [weak self] in
guard let self = self else { return }
- switch manager.send(message.text.data(using: .utf8)!, to: message.groupId!) {
+ switch manager.send(payloadData, to: message.groupId!) {
case .success((let roundId, let uniqueId, let roundURL)):
message.roundURL = roundURL
--
GitLab