style: auto-format entire codebase with cargo fmt (stable rustfmt.toml)
Some checks failed
ci/woodpecker/pr/check Pipeline failed
CI / Check (pull_request) Has been cancelled
CI / Format (pull_request) Has been cancelled
CI / Clippy (pull_request) Has been cancelled
CI / Build (macos-latest) (pull_request) Has been cancelled
CI / Build (ubuntu-latest) (pull_request) Has been cancelled
CI / Build (windows-latest) (pull_request) Has been cancelled
Some checks failed
ci/woodpecker/pr/check Pipeline failed
CI / Check (pull_request) Has been cancelled
CI / Format (pull_request) Has been cancelled
CI / Clippy (pull_request) Has been cancelled
CI / Build (macos-latest) (pull_request) Has been cancelled
CI / Build (ubuntu-latest) (pull_request) Has been cancelled
CI / Build (windows-latest) (pull_request) Has been cancelled
This commit is contained in:
@@ -1,20 +1,17 @@
|
||||
use crate::types::{ChatId, MessageId, UserId};
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
use tdlib_rs::enums::{
|
||||
ChatList, ConnectionState, Update, UserStatus,
|
||||
Chat as TdChat
|
||||
};
|
||||
use tdlib_rs::types::Message as TdMessage;
|
||||
use tdlib_rs::enums::{Chat as TdChat, ChatList, ConnectionState, Update, UserStatus};
|
||||
use tdlib_rs::functions;
|
||||
|
||||
|
||||
use tdlib_rs::types::Message as TdMessage;
|
||||
|
||||
use super::auth::{AuthManager, AuthState};
|
||||
use super::chats::ChatManager;
|
||||
use super::messages::MessageManager;
|
||||
use super::reactions::ReactionManager;
|
||||
use super::types::{ChatInfo, FolderInfo, MessageInfo, NetworkState, ProfileInfo, UserOnlineStatus};
|
||||
use super::types::{
|
||||
ChatInfo, FolderInfo, MessageInfo, NetworkState, ProfileInfo, UserOnlineStatus,
|
||||
};
|
||||
use super::users::UserCache;
|
||||
use crate::notifications::NotificationManager;
|
||||
|
||||
@@ -75,16 +72,15 @@ impl TdClient {
|
||||
/// A new `TdClient` instance ready for authentication.
|
||||
pub fn new(db_path: PathBuf) -> Self {
|
||||
// Пробуем загрузить credentials из Config (файл или env)
|
||||
let (api_id, api_hash) = crate::config::Config::load_credentials()
|
||||
.unwrap_or_else(|_| {
|
||||
// Fallback на прямое чтение из env (старое поведение)
|
||||
let api_id = env::var("API_ID")
|
||||
.unwrap_or_else(|_| "0".to_string())
|
||||
.parse()
|
||||
.unwrap_or(0);
|
||||
let api_hash = env::var("API_HASH").unwrap_or_default();
|
||||
(api_id, api_hash)
|
||||
});
|
||||
let (api_id, api_hash) = crate::config::Config::load_credentials().unwrap_or_else(|_| {
|
||||
// Fallback на прямое чтение из env (старое поведение)
|
||||
let api_id = env::var("API_ID")
|
||||
.unwrap_or_else(|_| "0".to_string())
|
||||
.parse()
|
||||
.unwrap_or(0);
|
||||
let api_hash = env::var("API_HASH").unwrap_or_default();
|
||||
(api_id, api_hash)
|
||||
});
|
||||
|
||||
let client_id = tdlib_rs::create_client();
|
||||
|
||||
@@ -106,9 +102,11 @@ impl TdClient {
|
||||
/// Configures notification manager from app config
|
||||
pub fn configure_notifications(&mut self, config: &crate::config::NotificationsConfig) {
|
||||
self.notification_manager.set_enabled(config.enabled);
|
||||
self.notification_manager.set_only_mentions(config.only_mentions);
|
||||
self.notification_manager
|
||||
.set_only_mentions(config.only_mentions);
|
||||
self.notification_manager.set_timeout(config.timeout_ms);
|
||||
self.notification_manager.set_urgency(config.urgency.clone());
|
||||
self.notification_manager
|
||||
.set_urgency(config.urgency.clone());
|
||||
// Note: show_preview is used when formatting notification body
|
||||
}
|
||||
|
||||
@@ -116,7 +114,8 @@ impl TdClient {
|
||||
///
|
||||
/// Should be called after chats are loaded to ensure muted chats don't trigger notifications.
|
||||
pub fn sync_notification_muted_chats(&mut self) {
|
||||
self.notification_manager.sync_muted_chats(&self.chat_manager.chats);
|
||||
self.notification_manager
|
||||
.sync_muted_chats(&self.chat_manager.chats);
|
||||
}
|
||||
|
||||
// Делегирование к auth
|
||||
@@ -257,12 +256,17 @@ impl TdClient {
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn get_pinned_messages(&mut self, chat_id: ChatId) -> Result<Vec<MessageInfo>, String> {
|
||||
pub async fn get_pinned_messages(
|
||||
&mut self,
|
||||
chat_id: ChatId,
|
||||
) -> Result<Vec<MessageInfo>, String> {
|
||||
self.message_manager.get_pinned_messages(chat_id).await
|
||||
}
|
||||
|
||||
pub async fn load_current_pinned_message(&mut self, chat_id: ChatId) {
|
||||
self.message_manager.load_current_pinned_message(chat_id).await
|
||||
self.message_manager
|
||||
.load_current_pinned_message(chat_id)
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn search_messages(
|
||||
@@ -442,7 +446,10 @@ impl TdClient {
|
||||
self.chat_manager.typing_status.as_ref()
|
||||
}
|
||||
|
||||
pub fn set_typing_status(&mut self, status: Option<(crate::types::UserId, String, std::time::Instant)>) {
|
||||
pub fn set_typing_status(
|
||||
&mut self,
|
||||
status: Option<(crate::types::UserId, String, std::time::Instant)>,
|
||||
) {
|
||||
self.chat_manager.typing_status = status;
|
||||
}
|
||||
|
||||
@@ -450,7 +457,9 @@ impl TdClient {
|
||||
&self.message_manager.pending_view_messages
|
||||
}
|
||||
|
||||
pub fn pending_view_messages_mut(&mut self) -> &mut Vec<(crate::types::ChatId, Vec<crate::types::MessageId>)> {
|
||||
pub fn pending_view_messages_mut(
|
||||
&mut self,
|
||||
) -> &mut Vec<(crate::types::ChatId, Vec<crate::types::MessageId>)> {
|
||||
&mut self.message_manager.pending_view_messages
|
||||
}
|
||||
|
||||
@@ -519,7 +528,11 @@ impl TdClient {
|
||||
});
|
||||
|
||||
// Обновляем позиции если они пришли
|
||||
for pos in update.positions.iter().filter(|p| matches!(p.list, ChatList::Main)) {
|
||||
for pos in update
|
||||
.positions
|
||||
.iter()
|
||||
.filter(|p| matches!(p.list, ChatList::Main))
|
||||
{
|
||||
crate::tdlib::chat_helpers::update_chat(self, chat_id, |chat| {
|
||||
chat.order = pos.order;
|
||||
chat.is_pinned = pos.is_pinned;
|
||||
@@ -530,27 +543,43 @@ impl TdClient {
|
||||
self.chats_mut().sort_by(|a, b| b.order.cmp(&a.order));
|
||||
}
|
||||
Update::ChatReadInbox(update) => {
|
||||
crate::tdlib::chat_helpers::update_chat(self, ChatId::new(update.chat_id), |chat| {
|
||||
chat.unread_count = update.unread_count;
|
||||
});
|
||||
crate::tdlib::chat_helpers::update_chat(
|
||||
self,
|
||||
ChatId::new(update.chat_id),
|
||||
|chat| {
|
||||
chat.unread_count = update.unread_count;
|
||||
},
|
||||
);
|
||||
}
|
||||
Update::ChatUnreadMentionCount(update) => {
|
||||
crate::tdlib::chat_helpers::update_chat(self, ChatId::new(update.chat_id), |chat| {
|
||||
chat.unread_mention_count = update.unread_mention_count;
|
||||
});
|
||||
crate::tdlib::chat_helpers::update_chat(
|
||||
self,
|
||||
ChatId::new(update.chat_id),
|
||||
|chat| {
|
||||
chat.unread_mention_count = update.unread_mention_count;
|
||||
},
|
||||
);
|
||||
}
|
||||
Update::ChatNotificationSettings(update) => {
|
||||
crate::tdlib::chat_helpers::update_chat(self, ChatId::new(update.chat_id), |chat| {
|
||||
// mute_for > 0 означает что чат замьючен
|
||||
chat.is_muted = update.notification_settings.mute_for > 0;
|
||||
});
|
||||
crate::tdlib::chat_helpers::update_chat(
|
||||
self,
|
||||
ChatId::new(update.chat_id),
|
||||
|chat| {
|
||||
// mute_for > 0 означает что чат замьючен
|
||||
chat.is_muted = update.notification_settings.mute_for > 0;
|
||||
},
|
||||
);
|
||||
}
|
||||
Update::ChatReadOutbox(update) => {
|
||||
// Обновляем last_read_outbox_message_id когда собеседник прочитал сообщения
|
||||
let last_read_msg_id = MessageId::new(update.last_read_outbox_message_id);
|
||||
crate::tdlib::chat_helpers::update_chat(self, ChatId::new(update.chat_id), |chat| {
|
||||
chat.last_read_outbox_message_id = last_read_msg_id;
|
||||
});
|
||||
crate::tdlib::chat_helpers::update_chat(
|
||||
self,
|
||||
ChatId::new(update.chat_id),
|
||||
|chat| {
|
||||
chat.last_read_outbox_message_id = last_read_msg_id;
|
||||
},
|
||||
);
|
||||
// Если это текущий открытый чат — обновляем is_read у сообщений
|
||||
if Some(ChatId::new(update.chat_id)) == self.current_chat_id() {
|
||||
for msg in self.current_chat_messages_mut().iter_mut() {
|
||||
@@ -588,7 +617,9 @@ impl TdClient {
|
||||
UserStatus::LastMonth(_) => UserOnlineStatus::LastMonth,
|
||||
UserStatus::Empty => UserOnlineStatus::LongTimeAgo,
|
||||
};
|
||||
self.user_cache.user_statuses.insert(UserId::new(update.user_id), status);
|
||||
self.user_cache
|
||||
.user_statuses
|
||||
.insert(UserId::new(update.user_id), status);
|
||||
}
|
||||
Update::ConnectionState(update) => {
|
||||
// Обновляем состояние сетевого соединения
|
||||
@@ -616,13 +647,15 @@ impl TdClient {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Helper functions
|
||||
pub fn extract_message_text_static(message: &TdMessage) -> (String, Vec<tdlib_rs::types::TextEntity>) {
|
||||
pub fn extract_message_text_static(
|
||||
message: &TdMessage,
|
||||
) -> (String, Vec<tdlib_rs::types::TextEntity>) {
|
||||
use tdlib_rs::enums::MessageContent;
|
||||
match &message.content {
|
||||
MessageContent::MessageText(text) => (text.text.text.clone(), text.text.entities.clone()),
|
||||
MessageContent::MessageText(text) => {
|
||||
(text.text.text.clone(), text.text.entities.clone())
|
||||
}
|
||||
_ => (String::new(), Vec::new()),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user