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/message.rs | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) (limited to 'src/message.rs') diff --git a/src/message.rs b/src/message.rs index e5caed1..878085e 100644 --- a/src/message.rs +++ b/src/message.rs @@ -5,25 +5,60 @@ use reactive_stores::ArcStore; use uuid::Uuid; 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 MacawMessage { - pub message: StateListener>, + pub message: ArenaItem>>, pub user: MacawUser, } impl MacawMessage { + pub fn get(&self) -> ArcStore { + self.try_get_value().unwrap().get() + } +} + +impl Deref for MacawMessage { + type Target = ArenaItem>>; + + fn deref(&self) -> &Self::Target { + &self.message + } +} + +impl DerefMut for MacawMessage { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.message + } +} + +impl From for MacawMessage { + fn from(value: ArcMacawMessage) -> Self { + Self { + message: ArenaItem::new_with_storage(value.message), + user: value.user.into(), + } + } +} + +#[derive(Clone)] +pub struct ArcMacawMessage { + pub message: StateListener>, + pub user: ArcMacawUser, +} + +impl ArcMacawMessage { pub fn got_message_and_user(message: Message, user: User) -> Self { let message_state_store: StateStore> = use_context().expect("no message state store"); let message = message_state_store.store(message.id, ArcStore::new(message)); - let user = MacawUser::got_user(user); + let user = ArcMacawUser::got_user(user); Self { message, user } } } -impl Deref for MacawMessage { +impl Deref for ArcMacawMessage { type Target = StateListener>; fn deref(&self) -> &Self::Target { @@ -31,7 +66,7 @@ impl Deref for MacawMessage { } } -impl DerefMut for MacawMessage { +impl DerefMut for ArcMacawMessage { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.message } -- cgit