fixes

src/tdlib/messages.rs

@@ -4,7 +4,7 @@ use tdlib_rs::enums::{ChatAction, InputMessageContent, InputMessageReplyTo, Mess
 use tdlib_rs::functions;
 use tdlib_rs::types::{Chat as TdChat, FormattedText, InputMessageReplyToMessage, InputMessageText, Message as TdMessage, TextEntity, TextParseModeMarkdown};
 
-use super::types::{ForwardInfo, MessageInfo, ReactionInfo, ReplyInfo};
+use super::types::{ForwardInfo, MessageBuilder, MessageInfo, ReactionInfo, ReplyInfo};
 
 /// Менеджер сообщений
 pub struct MessageManager {
@@ -375,7 +375,8 @@ impl MessageManager {
         let batch = std::mem::take(&mut self.pending_view_messages);
 
         for (chat_id, message_ids) in batch {
-            let _ = functions::view_messages(chat_id, message_ids, None, true, self.client_id).await;
+            let ids: Vec<i64> = message_ids.iter().map(|id| id.as_i64()).collect();
+            let _ = functions::view_messages(chat_id.as_i64(), ids, None, true, self.client_id).await;
         }
     }
 
@@ -454,7 +455,7 @@ impl MessageManager {
             if let tdlib_rs::enums::MessageReplyTo::Message(reply_msg) = reply_to {
                 // Здесь можно загрузить информацию об оригинальном сообщении
                 Some(ReplyInfo {
-                    message_id: reply_msg.message_id,
+                    message_id: MessageId::new(reply_msg.message_id),
                     sender_name: "Unknown".to_string(),
                     text: "...".to_string(),
                 })
@@ -488,22 +489,48 @@ impl MessageManager {
             })
             .unwrap_or_default();
 
-        Some(MessageInfo {
-            id: msg.id,
-            sender_name,
-            is_outgoing: msg.is_outgoing,
-            content: content_text,
-            entities,
-            date: msg.date,
-            edit_date: msg.edit_date,
-            is_read: !msg.contains_unread_mention,
-            can_be_edited: msg.can_be_edited,
-            can_be_deleted_only_for_self: msg.can_be_deleted_only_for_self,
-            can_be_deleted_for_all_users: msg.can_be_deleted_for_all_users,
-            reply_to,
-            forward_from,
-            reactions,
-        })
+        let mut builder = MessageBuilder::new(MessageId::new(msg.id))
+            .sender_name(sender_name)
+            .text(content_text)
+            .entities(entities)
+            .date(msg.date)
+            .edit_date(msg.edit_date);
+
+        if msg.is_outgoing {
+            builder = builder.outgoing();
+        } else {
+            builder = builder.incoming();
+        }
+
+        if !msg.contains_unread_mention {
+            builder = builder.read();
+        } else {
+            builder = builder.unread();
+        }
+
+        if msg.can_be_edited {
+            builder = builder.editable();
+        }
+
+        if msg.can_be_deleted_only_for_self {
+            builder = builder.deletable_for_self();
+        }
+
+        if msg.can_be_deleted_for_all_users {
+            builder = builder.deletable_for_all();
+        }
+
+        if let Some(reply) = reply_to {
+            builder = builder.reply_to(reply);
+        }
+
+        if let Some(forward) = forward_from {
+            builder = builder.forward_from(forward);
+        }
+
+        builder = builder.reactions(reactions);
+
+        Some(builder.build())
     }
 
     /// Получить недостающую reply информацию для сообщений
@@ -511,7 +538,7 @@ impl MessageManager {
         // Collect message IDs that need to be fetched
         let mut to_fetch = Vec::new();
         for msg in &self.current_chat_messages {
-            if let Some(ref reply) = msg.reply_to {
+            if let Some(ref reply) = msg.interactions.reply_to {
                 if reply.sender_name == "Unknown" {
                     to_fetch.push(reply.message_id);
                 }
@@ -522,17 +549,18 @@ impl MessageManager {
         if let Some(chat_id) = self.current_chat_id {
             for message_id in to_fetch {
                 if let Ok(original_msg_enum) =
-                    functions::get_message(chat_id, message_id, self.client_id).await
+                    functions::get_message(chat_id.as_i64(), message_id.as_i64(), self.client_id).await
                 {
                     if let tdlib_rs::enums::Message::Message(original_msg) = original_msg_enum {
                         if let Some(orig_info) = self.convert_message(&original_msg).await {
                             // Update the reply info
                             for msg in &mut self.current_chat_messages {
-                                if let Some(ref mut reply) = msg.reply_to {
+                                if let Some(ref mut reply) = msg.interactions.reply_to {
                                     if reply.message_id == message_id {
-                                        reply.sender_name = orig_info.sender_name.clone();
+                                        reply.sender_name = orig_info.metadata.sender_name.clone();
                                         reply.text = orig_info
                                             .content
+                                            .text
                                             .chars()
                                             .take(50)
                                             .collect::<String>();