Skip to content
Snippets Groups Projects
Commit 40155411 authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Fixed issue w/ payload

parent d956b887
No related branches found
No related tags found
2 merge requests!40v1.1.2b166,!38Using new database structure
......@@ -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)
}
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment