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/chat.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) (limited to 'src/chat.rs') diff --git a/src/chat.rs b/src/chat.rs index 6785b06..29e2641 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -5,26 +5,70 @@ use jid::BareJID; use reactive_stores::ArcStore; use leptos::prelude::*; -use crate::{state_store::{StateListener, StateStore}, user::MacawUser}; +use crate::{state_store::{StateListener, StateStore}, user::{ArcMacawUser, MacawUser}}; -#[derive(Clone)] +#[derive(Clone, Copy)] pub struct MacawChat { - pub chat: StateListener>, + pub chat: ArenaItem>>, pub user: MacawUser, // user: StateListener>, } impl MacawChat { + pub fn get(&self) -> ArcStore { + self.try_get_value().unwrap().get() + } +} + +impl Deref for MacawChat { + type Target = ArenaItem>>; + + fn deref(&self) -> &Self::Target { + &self.chat + } +} + +impl DerefMut for MacawChat { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.chat + } +} + +impl From for MacawChat { + fn from(value: ArcMacawChat) -> Self { + Self { + chat: ArenaItem::new_with_storage(value.chat), + user: value.user.into(), + } + } +} + +impl From for ArcMacawChat { + fn from(value: MacawChat) -> Self { + Self { + chat: value.chat.try_get_value().unwrap(), + user: value.user.into(), + } + } +} + +#[derive(Clone)] +pub struct ArcMacawChat { + pub chat: StateListener>, + pub user: ArcMacawUser, +} + +impl ArcMacawChat { pub fn got_chat_and_user(chat: Chat, user: User) -> Self { let chat_state_store: StateStore> = use_context().expect("no chat state store"); let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat)); - let user = MacawUser::got_user(user); + let user = ArcMacawUser::got_user(user); Self { chat, user } } } -impl Deref for MacawChat { +impl Deref for ArcMacawChat { type Target = StateListener>; fn deref(&self) -> &Self::Target { @@ -32,7 +76,7 @@ impl Deref for MacawChat { } } -impl DerefMut for MacawChat { +impl DerefMut for ArcMacawChat { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.chat } -- cgit