From ab654372e4d3766c8df17623a6de8922fc2a1960 Mon Sep 17 00:00:00 2001 From: cel 🌸 Date: Mon, 2 Jun 2025 19:50:45 +0100 Subject: feat: make `MacawUser`, `MacawChat` and `MacawMessage` arena-allocated --- src/components/chat_header.rs | 7 +++--- src/components/chats_list.rs | 16 ++++++------ src/components/chats_list/chats_list_item.rs | 19 ++++++-------- src/components/message.rs | 4 +-- src/components/message_history_buffer.rs | 34 +++++++++++++------------- src/components/new_chat.rs | 6 ++--- src/components/personal_status.rs | 5 ++-- src/components/roster_list/roster_list_item.rs | 8 +++--- 8 files changed, 47 insertions(+), 52 deletions(-) (limited to 'src/components') diff --git a/src/components/chat_header.rs b/src/components/chat_header.rs index 208e7f6..ab33d2b 100644 --- a/src/components/chat_header.rs +++ b/src/components/chat_header.rs @@ -6,13 +6,12 @@ use crate::{chat::MacawChat, components::avatar::AvatarWithPresence, user::get_n #[component] pub fn ChatViewHeader(chat: MacawChat) -> impl IntoView { - let chat_user = as Clone>::clone(&chat.user).into(); - let name = move || get_name(chat_user, true); - let jid = move || chat_user.jid().read().to_string(); + let name = move || get_name(chat.user.get().into(), true); + let jid = move || chat.user.get().jid().read().to_string(); view! {
- +
- - + +
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 = as Clone>::clone(&chat.chat).into(); - let chat_user: Store = - as Clone>::clone(&chat.user).into(); - let message_message: Store = 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 = 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! {
- +

{name}

{timeinfo}

{latest_message_body}

diff --git a/src/components/message.rs b/src/components/message.rs index 2ae2ef0..5deccdd 100644 --- a/src/components/message.rs +++ b/src/components/message.rs @@ -9,8 +9,8 @@ use super::icon::Delivery; #[component] pub fn Message(message: MacawMessage, major: bool, r#final: bool) -> impl IntoView { let message_message: Store = - as Clone>::clone(&message.message).into(); - let message_user = as Clone>::clone(&message.user).into(); + as Clone>::clone(&message.get()).into(); + let message_user = as Clone>::clone(&message.user.get()).into(); let avatar = LocalResource::new(move || get_avatar(message_user)); let name = move || get_name(message_user, false); diff --git a/src/components/message_history_buffer.rs b/src/components/message_history_buffer.rs index 36439a8..ecdba5b 100644 --- a/src/components/message_history_buffer.rs +++ b/src/components/message_history_buffer.rs @@ -7,15 +7,15 @@ use reactive_stores::{ArcStore, Store}; use tracing::{debug, error}; use uuid::Uuid; -use crate::{chat::MacawChat, client::Client, components::message::Message, message::MacawMessage, message_subscriptions::MessageSubscriptions}; +use crate::{chat::MacawChat, client::Client, components::message::Message, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions}; #[component] pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { let (messages, set_messages) = arc_signal(IndexMap::new()); let chat_chat: Store = - as Clone>::clone(&chat.chat).into(); + as Clone>::clone(&chat.get()).into(); let chat_user: Store = - as Clone>::clone(&chat.user).into(); + as Clone>::clone(&chat.user.get()).into(); let load_set_messages = set_messages.clone(); let load_messages = LocalResource::new(move || { @@ -33,7 +33,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { .map(|(message, message_user)| { ( message.id, - MacawMessage::got_message_and_user(message, message_user), + ArcMacawMessage::got_message_and_user(message, message_user), ) }) .collect::>(); @@ -63,16 +63,16 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { debug!("got new message in let message buffer"); let mut messages = load_new_messages_set.write(); if let Some((_, last)) = messages.last() { - if * as Clone>::clone(&last.message) + if * as Clone>::clone(&last.message.get()) .timestamp() .read() - < * as Clone>::clone(&new_message.message) + < * as Clone>::clone(&new_message.message.get()) .timestamp() .read() { messages.insert( as Clone>::clone( - &new_message.message, + &new_message.message.get(), ) .id() .get(), @@ -81,12 +81,12 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { debug!("set the new message in message buffer"); } else { let index = match messages.binary_search_by(|_, value| { - as Clone>::clone(&value.message) + as Clone>::clone(&value.message.get()) .timestamp() .read() .cmp( & as Clone>::clone( - &new_message.message, + &new_message.message.get(), ) .timestamp() .read(), @@ -99,7 +99,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { // TODO: check if this logic is correct index, as Clone>::clone( - &new_message.message, + &new_message.message.get(), ) .id() .get(), @@ -109,7 +109,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { } } else { messages.insert( - as Clone>::clone(&new_message.message) + as Clone>::clone(&new_message.message.get()) .id() .get(), new_message, @@ -120,10 +120,10 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { } }); 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_chat(sub_id, chat_chat.correspondent().get()); + .unsubscribe_chat(sub_id, chat_chat.correspondent().get_untracked()); } }); @@ -135,7 +135,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { .into_iter() .map(|(id, message)| { let message_timestamp = - as Clone>::clone(&message.message) + as Clone>::clone(&message.message.get()) .timestamp() .read() .naive_local(); @@ -143,7 +143,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { // if message_timestamp.date() > last_timestamp.date() { // messages_view = messages_view.push(date(message_timestamp.date())); // } - let major = if last_user.as_ref() != Some(&message.message.read().from) + let major = if last_user.as_ref() != Some(&message.message.get().read().from) || message_timestamp - last_timestamp > TimeDelta::minutes(3) { true @@ -151,7 +151,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { false }; last_user = Some( - as Clone>::clone(&message.message) + as Clone>::clone(&message.message.get()) .from() .get(), ); @@ -168,7 +168,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { view! {
- +
} diff --git a/src/components/new_chat.rs b/src/components/new_chat.rs index 8047afb..b706ca9 100644 --- a/src/components/new_chat.rs +++ b/src/components/new_chat.rs @@ -6,7 +6,7 @@ use leptos::{html::Input, prelude::*}; use reactive_stores::{ArcStore, Store}; use thiserror::Error; -use crate::{chat::MacawChat, client::Client, open_chats::OpenChatsPanel, state_store::StateStore, user::MacawUser}; +use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, open_chats::OpenChatsPanel, state_store::StateStore, user::{ArcMacawUser, MacawUser}}; #[derive(Clone, Debug, Error)] pub enum NewChatError { @@ -78,9 +78,9 @@ pub fn NewChatWidget(set_open_new_chat: WriteSignal) -> impl IntoView { let chat = { // let user = MacawUser::got_user(user); let user = user_state_store.store(user.jid.clone(), ArcStore::new(user)); - let user = MacawUser { user }; + let user = ArcMacawUser { user }; let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat)); - MacawChat { chat, user } + ArcMacawChat { chat, user } }; open_chats.update(|open_chats| open_chats.open(chat.clone())); set_open_new_chat.set(false); diff --git a/src/components/personal_status.rs b/src/components/personal_status.rs index f830a1b..8439756 100644 --- a/src/components/personal_status.rs +++ b/src/components/personal_status.rs @@ -11,13 +11,12 @@ pub fn PersonalStatus() -> impl IntoView { let (open, set_open) = signal(false); move || if let Some(user) = user.get() { - let user: Store = as Clone>::clone(&(*user.user)).into(); view! {
- +
{move || { @@ -26,7 +25,7 @@ pub fn PersonalStatus() -> impl IntoView { if open { view! { - + }.into_any() } else { diff --git a/src/components/roster_list/roster_list_item.rs b/src/components/roster_list/roster_list_item.rs index 46ac1cc..9ebc26a 100644 --- a/src/components/roster_list/roster_list_item.rs +++ b/src/components/roster_list/roster_list_item.rs @@ -5,13 +5,13 @@ use leptos::prelude::*; use reactive_stores::{ArcStore, Store}; use tracing::debug; -use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::Open}, contact::MacawContact, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name}; +use crate::{chat::{ArcMacawChat, MacawChat}, components::{avatar::AvatarWithPresence, sidebar::Open}, contact::MacawContact, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name}; #[component] pub fn RosterListItem(contact: MacawContact) -> impl IntoView { let contact_contact: Store = contact.contact; let contact_user: Store = - as Clone>::clone(&contact.user).into(); + as Clone>::clone(&contact.user.get()).into(); let name = move || get_name(contact_user, false); let open_chats: Store = @@ -23,11 +23,11 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView { correspondent: contact_user.jid().get(), have_chatted: false, }; - let chat = MacawChat::got_chat_and_user(chat, contact_user.get()); + let chat = ArcMacawChat::got_chat_and_user(chat, contact_user.get()); 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(Clone::clone(&chat))); }; let open = move || { -- cgit