fmt

src/conversation/llm/entity.rs

@@ -27,11 +27,18 @@ pub struct ImageDetails {
 
 impl ImageDetails {
     pub fn new(event_content: ImageMessageEventContent, mime: Mime, data: Vec<u8>) -> Self {
-        Self { event_content, mime, data }
+        Self {
+            event_content,
+            mime,
+            data,
+        }
     }
 
     pub fn filename(&self) -> String {
-        self.event_content.filename.clone().unwrap_or(self.event_content.body.clone())
+        self.event_content
+            .filename
+            .clone()
+            .unwrap_or(self.event_content.body.clone())
     }
 }
 
@@ -54,7 +61,7 @@ impl PartialEq for MessageContent {
             (MessageContent::Image(a), MessageContent::Image(b)) => {
                 // We can probably do better than this by inspecting `.event_conten1t.source`, but for now this is good enough.
                 a.filename() == b.filename()
-            },
+            }
             _ => false,
         }
     }

src/conversation/llm/tests.rs

@@ -20,11 +20,15 @@ fn test_messages_by_the_bot_are_identified_correctly() {
     let llm_message = convert_matrix_message_to_llm_message(&matrix_message, &bot_user_id).unwrap();
 
     assert_eq!(llm_message.author, Author::Assistant);
-    assert_eq!(llm_message.content, MessageContent::Text("Hello!".to_string()));
+    assert_eq!(
+        llm_message.content,
+        MessageContent::Text("Hello!".to_string())
+    );
 }
 
 #[test]
-fn test_notice_messages_by_bot_with_speech_to_text_prefix_are_cleaned_up_and_considered_sent_by_user() {
+fn test_notice_messages_by_bot_with_speech_to_text_prefix_are_cleaned_up_and_considered_sent_by_user()
+ {
     let bot_user_id =
         OwnedUserId::try_from("@bot:example.com").expect("Failed to parse bot user ID");
 
@@ -43,7 +47,10 @@ fn test_notice_messages_by_bot_with_speech_to_text_prefix_are_cleaned_up_and_con
     let llm_message = convert_matrix_message_to_llm_message(&matrix_message, &bot_user_id).unwrap();
 
     assert_eq!(llm_message.author, Author::User);
-    assert_eq!(llm_message.content, MessageContent::Text(source_message_text.to_string()));
+    assert_eq!(
+        llm_message.content,
+        MessageContent::Text(source_message_text.to_string())
+    );
 }
 
 #[test]

src/conversation/llm/tokenization.rs

@@ -150,8 +150,7 @@ pub mod test {
         let third = super::Message {
             author: super::Author::User,
             content: super::MessageContent::Text(
-                "This is the 3rd message in this conversation. It shall be preserved."
-                    .to_owned(),
+                "This is the 3rd message in this conversation. It shall be preserved.".to_owned(),
             ),
             timestamp: chrono::Utc::now(),
         };

src/conversation/llm/utils.rs

@@ -23,17 +23,15 @@ fn convert_bot_message(matrix_message: &MatrixMessage) -> Option<Message> {
         MatrixMessageContent::Notice(text) => {
             convert_bot_notice_message(text, &matrix_message.timestamp)
         }
-        MatrixMessageContent::Image(image_content, mime_type, media_bytes) => {
-            Some(Message {
-                author: Author::Assistant,
-                content: MessageContent::Image(ImageDetails::new(
-                    image_content.clone(),
-                    mime_type.clone(),
-                    media_bytes.clone()
-                )),
-                timestamp: matrix_message.timestamp.to_owned(),
-            })
-        }
+        MatrixMessageContent::Image(image_content, mime_type, media_bytes) => Some(Message {
+            author: Author::Assistant,
+            content: MessageContent::Image(ImageDetails::new(
+                image_content.clone(),
+                mime_type.clone(),
+                media_bytes.clone(),
+            )),
+            timestamp: matrix_message.timestamp.to_owned(),
+        }),
     }
 }
 
@@ -73,30 +71,24 @@ fn convert_bot_notice_message(
 
 fn convert_user_message(matrix_message: &MatrixMessage) -> Option<Message> {
     match &matrix_message.content {
-        MatrixMessageContent::Text(text) => {
-            Some(Message {
-                author: Author::User,
-                content: MessageContent::Text(text.clone()),
-                timestamp: matrix_message.timestamp.to_owned(),
-            })
-        }
-        MatrixMessageContent::Notice(text) => {
-            Some(Message {
-                author: Author::User,
-                content: MessageContent::Text(text.clone()),
-                timestamp: matrix_message.timestamp.to_owned(),
-            })
-        }
-        MatrixMessageContent::Image(image_content, mime_type, media_bytes) => {
-            Some(Message {
-                author: Author::User,
-                content: MessageContent::Image(ImageDetails::new(
-                    image_content.clone(),
-                    mime_type.clone(),
-                    media_bytes.clone(),
-                )),
-                timestamp: matrix_message.timestamp.to_owned(),
-            })
-        }
+        MatrixMessageContent::Text(text) => Some(Message {
+            author: Author::User,
+            content: MessageContent::Text(text.clone()),
+            timestamp: matrix_message.timestamp.to_owned(),
+        }),
+        MatrixMessageContent::Notice(text) => Some(Message {
+            author: Author::User,
+            content: MessageContent::Text(text.clone()),
+            timestamp: matrix_message.timestamp.to_owned(),
+        }),
+        MatrixMessageContent::Image(image_content, mime_type, media_bytes) => Some(Message {
+            author: Author::User,
+            content: MessageContent::Image(ImageDetails::new(
+                image_content.clone(),
+                mime_type.clone(),
+                media_bytes.clone(),
+            )),
+            timestamp: matrix_message.timestamp.to_owned(),
+        }),
     }
 }

src/conversation/matrix/mod.rs

@@ -6,6 +6,6 @@ mod utils;
 pub(crate) use room_display_name_fetcher::RoomDisplayNameFetcher;
 pub(crate) use room_event_fetcher::RoomEventFetcher;
 
-pub(crate) use entity::{MatrixMessage, MatrixMessageProcessingParams, MatrixMessageContent};
+pub(crate) use entity::{MatrixMessage, MatrixMessageContent, MatrixMessageProcessingParams};
 
 pub(crate) use utils::*;

src/conversation/matrix/utils/mod.rs

@@ -42,7 +42,9 @@ pub async fn get_matrix_messages_in_thread(
     let mut messages: Vec<MatrixMessage> = Vec::new();
 
     for matrix_native_message in messages_native {
-        let message_result = convert_matrix_native_event_to_matrix_message(matrix_link, &matrix_native_message).await?;
+        let message_result =
+            convert_matrix_native_event_to_matrix_message(matrix_link, &matrix_native_message)
+                .await?;
 
         if let Some(message) = message_result {
             messages.push(message);
@@ -64,7 +66,9 @@ pub async fn get_matrix_messages_in_reply_chain(
     let mut messages: Vec<MatrixMessage> = Vec::new();
 
     for matrix_native_message in messages_native {
-        let message_result = convert_matrix_native_event_to_matrix_message(matrix_link, &matrix_native_message).await?;
+        let message_result =
+            convert_matrix_native_event_to_matrix_message(matrix_link, &matrix_native_message)
+                .await?;
 
         if let Some(message) = message_result {
             messages.push(message);
@@ -261,7 +265,10 @@ pub async fn convert_matrix_native_event_to_matrix_message(
             format: mxlink::matrix_sdk::media::MediaFormat::File,
         };
 
-        let file_name = image_content.filename.clone().unwrap_or(image_content.body.clone());
+        let file_name = image_content
+            .filename
+            .clone()
+            .unwrap_or(image_content.body.clone());
 
         let mime_type = get_mime_type_from_file_name(&file_name);
 

src/conversation/matrix_llm_bridge.rs

@@ -33,7 +33,8 @@ pub async fn create_llm_conversation_for_matrix_reply_chain(
     event_id: OwnedEventId,
     params: &MatrixMessageProcessingParams,
 ) -> Result<Conversation, mxlink::matrix_sdk::Error> {
-    let messages = get_matrix_messages_in_reply_chain(matrix_link, event_fetcher, room, event_id).await?;
+    let messages =
+        get_matrix_messages_in_reply_chain(matrix_link, event_fetcher, room, event_id).await?;
 
     let llm_messages = filter_messages_and_convert_to_llm_messages(messages, params).await;