diff options
Diffstat (limited to 'src/components/chats_list.rs')
| -rw-r--r-- | src/components/chats_list.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/components/chats_list.rs b/src/components/chats_list.rs index b8cf34c..a5ecc9b 100644 --- a/src/components/chats_list.rs +++ b/src/components/chats_list.rs @@ -4,7 +4,7 @@ use jid::BareJID; use leptos::prelude::*; use tracing::debug; -use crate::{chat::MacawChat, client::Client, components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay}, icon::Icon, message::MacawMessage, message_subscriptions::MessageSubscriptions}; +use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay}, icon::Icon, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions}; mod chats_list_item; @@ -26,8 +26,8 @@ pub fn ChatsList() -> impl IntoView { ( chat.correspondent.clone(), ( - MacawChat::got_chat_and_user(chat, chat_user), - MacawMessage::got_message_and_user(message, message_user), + ArcMacawChat::got_chat_and_user(chat, chat_user), + ArcMacawMessage::got_message_and_user(message, message_user), ), ) }) @@ -55,7 +55,7 @@ pub fn ChatsList() -> impl IntoView { if let Some((chat, _latest_message)) = chats.shift_remove(&to) { // TODO: check if new message is actually latest message debug!("chat existed"); - debug!("new message: {}", new_message.message.read().body.body); + debug!("new message: {}", new_message.message.get().read().body.body); chats.insert_before(0, to, (chat.clone(), new_message)); debug!("done setting"); } else { @@ -64,7 +64,7 @@ pub fn ChatsList() -> impl IntoView { let chat = client.get_chat(to.clone()).await.unwrap(); let user = client.get_user(to.clone()).await.unwrap(); debug!("before got chat"); - let chat = MacawChat::got_chat_and_user(chat, user); + let chat = ArcMacawChat::got_chat_and_user(chat, user); debug!("after got chat"); chats.insert_before(0, to, (chat, new_message)); debug!("done setting"); @@ -73,7 +73,7 @@ pub fn ChatsList() -> impl IntoView { debug!("set the new message"); }); on_cleanup(move || { - if let Some(sub_id) = sub_id.get() { + if let Some(sub_id) = sub_id.get_untracked() { new_messages_signal.write().unsubscribe_all(sub_id); } }); @@ -99,8 +99,8 @@ pub fn ChatsList() -> impl IntoView { </div> </div> <div class="chats-list-chats"> - <For each=move || chats.get() key=|chat| chat.1.1.message.read().id let(chat)> - <ChatsListItem chat=chat.1.0 message=chat.1.1 /> + <For each=move || chats.get() key=|chat| chat.1.1.message.get().read().id let(chat)> + <ChatsListItem chat=chat.1.0.into() message=chat.1.1.into() /> </For> </div> </div> |