summaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/chat_header.rs7
-rw-r--r--src/components/chats_list.rs16
-rw-r--r--src/components/chats_list/chats_list_item.rs19
-rw-r--r--src/components/message.rs4
-rw-r--r--src/components/message_history_buffer.rs34
-rw-r--r--src/components/new_chat.rs6
-rw-r--r--src/components/personal_status.rs5
-rw-r--r--src/components/roster_list/roster_list_item.rs8
8 files changed, 47 insertions, 52 deletions
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 = <ArcStore<filamento::user::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! {
<div class="chat-view-header panel">
- <AvatarWithPresence user=chat_user />
+ <AvatarWithPresence user=chat.user.get().into() />
<div class="user-info">
<h2 class="name">{name}</h2>
<h3>{jid}</h3>
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>
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<filamento::chat::Message> =
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message).into();
- let message_user = <ArcStore<filamento::user::User> as Clone>::clone(&message.user).into();
+ <ArcStore<filamento::chat::Message> as Clone>::clone(&message.get()).into();
+ let message_user = <ArcStore<filamento::user::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<Chat> =
- <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.chat).into();
+ <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.get()).into();
let chat_user: Store<User> =
- <ArcStore<filamento::user::User> as Clone>::clone(&chat.user).into();
+ <ArcStore<filamento::user::User> 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::<IndexMap<Uuid, _>>();
@@ -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 *<ArcStore<filamento::chat::Message> as Clone>::clone(&last.message)
+ if *<ArcStore<filamento::chat::Message> as Clone>::clone(&last.message.get())
.timestamp()
.read()
- < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message)
+ < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
.timestamp()
.read()
{
messages.insert(
<ArcStore<filamento::chat::Message> 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| {
- <ArcStore<filamento::chat::Message> as Clone>::clone(&value.message)
+ <ArcStore<filamento::chat::Message> as Clone>::clone(&value.message.get())
.timestamp()
.read()
.cmp(
&<ArcStore<filamento::chat::Message> 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,
<ArcStore<filamento::chat::Message> 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(
- <ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message)
+ <ArcStore<filamento::chat::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 =
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message)
+ <ArcStore<filamento::chat::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(
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message)
+ <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
.from()
.get(),
);
@@ -168,7 +168,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
view! {
<div class="messages-buffer">
<For each=each key=|message| (message.0, message.1.1, message.1.2) let(message)>
- <Message message=message.1.0 major=message.1.1 r#final=message.1.2 />
+ <Message message=message.1.0.into() major=message.1.1 r#final=message.1.2 />
</For>
</div>
}
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<bool>) -> 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<User> = <ArcStore<filamento::user::User> as Clone>::clone(&(*user.user)).into();
view! {
<div class="dock-item" class:focused=move || *open.read() on:click=move |_| {
debug!("set open to true");
set_open.update(|state| *state = !*state)
}>
- <AvatarWithPresence user=user />
+ <AvatarWithPresence user=user.get().into() />
<div class="dock-pill"></div>
</div>
{move || {
@@ -26,7 +25,7 @@ pub fn PersonalStatus() -> impl IntoView {
if open {
view! {
<Overlay set_open>
- <PersonalStatusMenu user set_open/>
+ <PersonalStatusMenu user=user.get().into() set_open/>
</Overlay>
}.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.contact;
let contact_user: Store<User> =
- <ArcStore<filamento::user::User> as Clone>::clone(&contact.user).into();
+ <ArcStore<filamento::user::User> as Clone>::clone(&contact.user.get()).into();
let name = move || get_name(contact_user, false);
let open_chats: Store<OpenChatsPanel> =
@@ -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 || {
generated by cgit (git 2.34.1) at 2025-06-07 02:30:40 +0000