diff options
Diffstat (limited to '')
| -rw-r--r-- | src/components/chats_list.rs | 16 | ||||
| -rw-r--r-- | src/components/chats_list/chats_list_item.rs | 19 |
2 files changed, 16 insertions, 19 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> diff --git a/src/components/chats_list/chats_list_item.rs b/src/components/chats_list/chats_list_item.rs index 191f163..d1da727 100644 --- a/src/components/chats_list/chats_list_item.rs +++ b/src/components/chats_list/chats_list_item.rs @@ -10,33 +10,30 @@ use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::O #[component] pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView { - let chat_chat: Store<Chat> = <ArcStore<Chat> as Clone>::clone(&chat.chat).into(); - let chat_user: Store<User> = - <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into(); - let message_message: Store<Message> = <ArcStore<Message> as Clone>::clone(&message.message).into(); - let name = move || get_name(chat_user, true); + let name = move || get_name(chat.user.get().into(), true); // TODO: store fine-grained reactivity - let latest_message_body = move || message_message.body().get().body; + let latest_message_body = move || message.get().body().get().body; let open_chats: Store<OpenChatsPanel> = use_context().expect("no open chats panel store in context"); let open_chat = move |_| { debug!("opening chat"); - open_chats.update(|open_chats| open_chats.open(chat.clone())); + open_chats.update(|open_chats| open_chats.open(chat.into())); + // open_chats.update(|open_chats| open_chats.open(chat.chat.try_get_value().unwrap().get().clone())); }; let open = move || { if let Some(open_chat) = &*open_chats.chat_view().read() { debug!("got open chat: {:?}", open_chat); - if *open_chat == *chat_chat.correspondent().read() { + if *open_chat == *chat.get().correspondent().read() { return Open::Focused; } } if let Some(_backgrounded_chat) = open_chats .chats() .read() - .get(chat_chat.correspondent().read().deref()) + .get(chat.get().correspondent().read().deref()) { return Open::Open; } @@ -45,7 +42,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView { let focused = move || open().is_focused(); let open = move || open().is_open(); - let date = move || message_message.timestamp().read().naive_local(); + let date = move || message.get().timestamp().read().naive_local(); let now = move || Local::now().naive_local(); let timeinfo = move || if date().date() == now().date() { // TODO: localisation/config @@ -56,7 +53,7 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView { view! { <div class="chats-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat> - <AvatarWithPresence user=chat_user /> + <AvatarWithPresence user=chat.user.get().into() /> <div class="item-info"> <div class="main-info"><p class="name">{name}</p><p class="timestamp">{timeinfo}</p></div> <div class="sub-info"><p class="message-preview">{latest_message_body}</p><p><!-- "TODO: delivery or unread state" --></p></div> |