diff options
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/macaw.rs | 5 | ||||
| -rw-r--r-- | src/views/macaw/open_chats_panel.rs | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/views/macaw.rs b/src/views/macaw.rs index 1b7051f..328e3d2 100644 --- a/src/views/macaw.rs +++ b/src/views/macaw.rs @@ -102,7 +102,7 @@ pub fn Macaw( } UpdateMessage::Presence { from, presence } => { let bare_jid = from.to_bare(); - if let Some(presences) = user_presences.read().user_presences.get(&bare_jid) { + if let Some(presences) = user_presences.read_untracked().user_presences.get(&bare_jid) { if let Some(resource) = from.resourcepart() { presences.write().update_presence(resource.clone(), presence); } @@ -128,8 +128,7 @@ pub fn Macaw( } UpdateMessage::MessageDelivery { id, chat, delivery } => { messages_store.modify(&id, |message| { - <ArcStore<filamento::chat::Message> as Clone>::clone(&message) - .delivery() + <ArcStore<filamento::chat::Message> as Clone>::clone(&message).delivery() .set(Some(delivery)) }); } diff --git a/src/views/macaw/open_chats_panel.rs b/src/views/macaw/open_chats_panel.rs index ddc9ec9..bdb0084 100644 --- a/src/views/macaw/open_chats_panel.rs +++ b/src/views/macaw/open_chats_panel.rs @@ -57,13 +57,16 @@ mod open_chat { #[component] pub fn OpenChatView(chat: MacawChat) -> impl IntoView { - let chat_jid = move || chat.chat.try_get_value().unwrap().get().correspondent().get(); - view! { <div class="open-chat-view"> <ChatViewHeader chat=chat.clone() /> <MessageHistoryBuffer chat=chat.clone() /> - <ChatViewMessageComposer chat=chat_jid() /> + {move || { + let chat_jid = chat.get().correspondent().get(); + view! { + <ChatViewMessageComposer chat=chat_jid /> + } + }} </div> } } |