diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib.rs | 110 |
1 files changed, 100 insertions, 10 deletions
@@ -11,6 +11,7 @@ use std::{ time::{self, Duration}, }; +use chrono::{NaiveDateTime, TimeDelta}; use filamento::{ chat::{Body, Chat, ChatStoreFields, Message, MessageStoreFields}, db::Db, error::{CommandError, ConnectionError, DatabaseError}, files::FilesMem, roster::{Contact, ContactStoreFields}, user::{User, UserStoreFields}, UpdateMessage }; @@ -521,7 +522,94 @@ pub fn ChatViewHeader(chat: MacawChat) -> impl IntoView { #[component] pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView { - view! {} + let (messages, set_messages) = signal(IndexMap::new()); + let chat_chat = *chat.chat; + let chat_user = *chat.user; + + let load_messages = LocalResource::new(move || async move { + let client = use_context::<Client>().expect("client not in context"); + let messages = client.get_messages_with_users(chat_chat.correspondent().get_untracked()).await.map_err(|e| e.to_string()); + match messages { + Ok(m) => { + let messages = m.into_iter().map(|(message, message_user)| { + (message.id, MacawMessage::got_message_and_user(message, message_user)) + }).rev().collect::<IndexMap<Uuid, _>>(); + set_messages.set(messages); + }, + Err(_) => { + // TODO: show error message at top of chats list + }, + } + }); + + // TODO: filter new messages signal + let new_messages_signal: RwSignal<MessageSubscriptions> = use_context().unwrap(); + let _load_new_messages = LocalResource::new(move || async move { + load_messages.await; + let mut new_messages = new_messages_signal.write().subscribe_chat(chat_chat.correspondent().get_untracked()); + while let Some(new_message) = new_messages.recv().await { + debug!("got new message in let message buffer"); + let mut messages= set_messages.write(); + if let Some((_, last)) = messages.last() { + if *last.message.timestamp().read_untracked() < *new_message.timestamp().read_untracked() { + messages + .insert(new_message.message.id().get_untracked(), new_message); + debug!("set the new message in message buffer"); + } else { + let index = match messages.binary_search_by(|_, value| { + value.message.timestamp().read_untracked().cmp(&new_message.message.timestamp().read_untracked()) + }) { + Ok(i) => i, + Err(i) => i, + }; + messages.insert_before( + // TODO: check if this logic is correct + index, + new_message.message.id().get_untracked(), + new_message, + ); + debug!("set the new message in message buffer"); + } + } else { + messages + .insert(new_message.message.id().get_untracked(), new_message); + debug!("set the new message in message buffer"); + } + } + }); + + let each = move || { + let mut last_timestamp = NaiveDateTime::MIN; + let mut last_user: Option<JID> = None; + let mut messages = messages.get().into_iter().map(|(id, message)| { + let message_timestamp = message.message.timestamp().read().naive_local(); + // 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) + || message_timestamp - last_timestamp > TimeDelta::minutes(3) + { + true + } else { + false + }; + last_user = Some(message.message.from().get()); + last_timestamp = message_timestamp; + (id, (message, major, false)) + }).collect::<Vec<_>>(); + if let Some((_id, (_, _, last))) = messages.last_mut() { + *last = true + } + messages.into_iter().rev() + }; + + view! { + <div class="messages-buffer"> + <For each=each key=|message| message.0 let(message)> + <Message message=message.1.0 major=message.1.1 r#final=message.1.2 /> + </For> + </div> + } } #[component] @@ -533,30 +621,31 @@ pub fn Message(message: MacawMessage, major: bool, r#final: bool) -> impl IntoVi // TODO: chrono-humanize? // TODO: if final, show delivery not only on hover. + // {move || message_message.delivery().read().map(|delivery| delivery.to_string()).unwrap_or_default()} if major { view! { <div class="chat-message major"> - <img class="avatar" src=avatar /> - <div> + <div class="left"><img class="avatar" src=avatar /></div> + <div class="middle"> <div class="message-info"> - <div>{name}</div> - <div>{move || message_message.timestamp().read().to_string()}</div> + <div class="message-user-name">{name}</div> + <div class="message-timestamp">{move || message_message.timestamp().read().format("%H:%M").to_string()}</div> </div> <div class="message-text"> {move || message_message.body().read().body.clone()} </div> </div> - <div class="message-delivery"></div> + <div class="right message-delivery"></div> </div> }.into_any() } else { view! { <div class="chat-message minor"> - <div class="message-timestamp"> - {move || message_message.timestamp().read().to_string()} + <div class="left message-timestamp"> + {move || message_message.timestamp().read().format("%H:%M").to_string()} </div> - <div class="message-text">{move || message_message.body().read().body.clone()}</div> - <div class="message-delivery"></div> + <div class="middle message-text">{move || message_message.body().read().body.clone()}</div> + <div class="right message-delivery"></div> </div> }.into_any() } @@ -967,6 +1056,7 @@ fn ChatsList() -> impl IntoView { debug!("got new message in let"); let mut chats = set_chats.write(); 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.read().body.body); chats.insert_before(0, to, (chat.clone(), new_message)); |