plumb attachment guids for sendmessage
This commit is contained in:
@@ -175,7 +175,7 @@ impl AttachmentStore {
|
||||
daemon_event_sink: &Sender<DaemonEvent>,
|
||||
) -> Result<String> {
|
||||
use tokio::fs::File;
|
||||
use tokio::io::BufReader;
|
||||
use tokio::io::BufReader;
|
||||
|
||||
// Create uploads directory if it doesn't exist.
|
||||
let uploads_path = store_path.join("uploads");
|
||||
|
||||
@@ -48,8 +48,9 @@ pub enum Event {
|
||||
/// Parameters:
|
||||
/// - conversation_id: The ID of the conversation to send the message to.
|
||||
/// - text: The text of the message to send.
|
||||
/// - attachment_guids: The GUIDs of the attachments to send.
|
||||
/// - reply: The outgoing message ID (not the server-assigned message ID).
|
||||
SendMessage(String, String, Reply<Uuid>),
|
||||
SendMessage(String, String, Vec<String>, Reply<Uuid>),
|
||||
|
||||
/// Notifies the daemon that a message has been sent.
|
||||
/// Parameters:
|
||||
|
||||
@@ -251,10 +251,10 @@ impl Daemon {
|
||||
reply.send(()).unwrap();
|
||||
}
|
||||
|
||||
Event::SendMessage(conversation_id, text, reply) => {
|
||||
Event::SendMessage(conversation_id, text, attachment_guids, reply) => {
|
||||
let conversation_id = conversation_id.clone();
|
||||
let uuid = self
|
||||
.enqueue_outgoing_message(text, conversation_id.clone())
|
||||
.enqueue_outgoing_message(text, conversation_id.clone(), attachment_guids)
|
||||
.await;
|
||||
reply.send(uuid).unwrap();
|
||||
|
||||
@@ -396,11 +396,12 @@ impl Daemon {
|
||||
.await
|
||||
}
|
||||
|
||||
async fn enqueue_outgoing_message(&mut self, text: String, conversation_id: String) -> Uuid {
|
||||
async fn enqueue_outgoing_message(&mut self, text: String, conversation_id: String, attachment_guids: Vec<String>) -> Uuid {
|
||||
let conversation_id = conversation_id.clone();
|
||||
let outgoing_message = OutgoingMessage::builder()
|
||||
.text(text)
|
||||
.conversation_id(conversation_id.clone())
|
||||
.file_transfer_guids(attachment_guids)
|
||||
.build();
|
||||
|
||||
// Keep a record of this so we can provide a consistent model to the client.
|
||||
|
||||
@@ -226,8 +226,9 @@ impl DbusRepository for ServerImpl {
|
||||
&mut self,
|
||||
conversation_id: String,
|
||||
text: String,
|
||||
attachment_guids: Vec<String>,
|
||||
) -> Result<String, dbus::MethodErr> {
|
||||
self.send_event_sync(|r| Event::SendMessage(conversation_id, text, r))
|
||||
self.send_event_sync(|r| Event::SendMessage(conversation_id, text, attachment_guids, r))
|
||||
.map(|uuid| uuid.to_string())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user