1 files changed, 9 insertions, 16 deletions

diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index 26f37d58..510bf043 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -2,12 +2,11 @@
 
 use crate::Client;
 use azalea_chat::Component;
-use azalea_crypto::MessageSignature;
 use azalea_protocol::packets::game::{
-    clientbound_player_chat_packet::{ClientboundPlayerChatPacket, LastSeenMessagesUpdate},
+    clientbound_player_chat_packet::ClientboundPlayerChatPacket,
     clientbound_system_chat_packet::ClientboundSystemChatPacket,
     serverbound_chat_command_packet::ServerboundChatCommandPacket,
-    serverbound_chat_packet::ServerboundChatPacket,
+    serverbound_chat_packet::{LastSeenMessagesUpdate, ServerboundChatPacket},
 };
 use std::{
     sync::Arc,
@@ -33,7 +32,7 @@ impl ChatPacket {
     pub fn message(&self) -> Component {
         match self {
             ChatPacket::System(p) => p.content.clone(),
-            ChatPacket::Player(p) => p.message(false),
+            ChatPacket::Player(p) => p.message(),
         }
     }
 
@@ -47,7 +46,7 @@ impl ChatPacket {
                 // If it's a player chat packet, then the sender and content
                 // are already split for us.
                 Some(p.chat_type.name.to_string()),
-                p.message.content(false).to_string(),
+                p.body.content.clone(),
             ),
             ChatPacket::System(p) => {
                 let message = p.content.to_string();
@@ -88,7 +87,7 @@ impl Client {
     /// so you should use that instead.
     pub async fn send_chat_packet(&self, message: &str) -> Result<(), std::io::Error> {
         // TODO: chat signing
-        let signature = sign_message();
+        // let signature = sign_message();
         let packet = ServerboundChatPacket {
             message: message.to_string(),
             timestamp: SystemTime::now()
@@ -98,8 +97,7 @@ impl Client {
                 .try_into()
                 .expect("Instant should fit into a u64"),
             salt: azalea_crypto::make_salt(),
-            signature,
-            signed_preview: false,
+            signature: None,
             last_seen_messages: LastSeenMessagesUpdate::default(),
         }
         .get();
@@ -120,7 +118,6 @@ impl Client {
                 .expect("Instant should fit into a u64"),
             salt: azalea_crypto::make_salt(),
             argument_signatures: vec![],
-            signed_preview: false,
             last_seen_messages: LastSeenMessagesUpdate::default(),
         }
         .get();
@@ -143,14 +140,10 @@ impl Client {
             self.send_chat_packet(message).await
         }
     }
-
-    // will be used for when the server tells the client about a chat preview
-    // with custom formatting
-    // pub fn acknowledge_preview(&self, message: &str) {}
 }
 
 // TODO
 // MessageSigner, ChatMessageContent, LastSeenMessages
-fn sign_message() -> MessageSignature {
-    MessageSignature::default()
-}
+// fn sign_message() -> MessageSignature {
+//     MessageSignature::default()
+// }