chat adjustments

This commit is contained in:
yves committed 2026-11-21 09:48:54 +01:00
1 parent 5532a7ce06
commit 6ac21ccf4c
5 files changed
+246 -44

No files matched your search

+42 -1
View File
@@ -26,7 +26,7 @@ use std::path::Path;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
use futures_util::future::join_all;
use meow_core::contact::{Contact, ContactState};
use meow_core::contact::ContactState;
use meow_core::invitation::{self, OfferInfo};
use meow_core::server::canonical_url;
use meow_core::{messaging, rpc};
@@ -37,6 +37,7 @@ use meow_proto::Message;
use meow_store::{Batch, RetiredMailbox, SpaceId, State as SpaceState, Store};
pub use background::{BackgroundOptions, ClientHandle};
pub use meow_core::contact::Contact;
pub use meow_core::contact::ContactState as State;
pub use meow_core::server::ServerInfo;
pub use meow_proto::PROTOCOL_VERSION;
@@ -150,6 +151,17 @@ pub struct SendReport {
pub delivered_to: usize,
}
/// Last message and unread count of a conversation ([`MeowClient::conversation_summary`]).
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ConversationSummary {
pub last: Option<HistoryEntry>,
/// Received messages not read yet (counted back to the last read or sent one).
pub unread: usize,
}
/// Segments scanned at most to count unread messages.
const SUMMARY_MAX_PAGES: usize = 8;
/// Events kept for slow subscribers.
const EVENT_BUFFER: usize = 256;
@@ -552,6 +564,35 @@ impl MeowClient {
Ok(lock(&self.store)?.history(sp.id, &sp.state.contacts[ci].id, page)?)
}
/// Last message and number of unread received messages of a conversation. Unread
/// messages are counted from the latest segment backwards, stopping at the first
/// segment that contains a read or sent message (at most [`SUMMARY_MAX_PAGES`]).
pub fn conversation_summary(&self, name: &str) -> Result<ConversationSummary> {
let (si, ci) = self.locate(name)?;
let sp = &self.spaces[si];
let cid = &sp.state.contacts[ci].id;
let store = lock(&self.store)?;
let mut page = store.history(sp.id, cid, None)?;
let last = page.entries.last().cloned();
let mut unread = 0;
for _ in 0..SUMMARY_MAX_PAGES {
let mut stop = false;
for e in page.entries.iter().rev() {
if !e.outbound && e.status < Status::Read {
unread += 1;
} else {
stop = true;
break;
}
}
match page.prev {
Some(p) if !stop => page = store.history(sp.id, cid, Some(p))?,
_ => break,
}
}
Ok(ConversationSummary { last, unread })
}
/// Mark every received message of a conversation as read, and tell the contact
/// (unless read receipts are off). Returns how many messages changed.
pub async fn mark_read(&mut self, name: &str) -> Result<usize> {
+4
View File
@@ -587,10 +587,14 @@ async fn delivery_and_read_receipts() {
vec![Status::Delivered, Status::Delivered]
);
let summary = bob.conversation_summary("alice").unwrap();
assert_eq!(summary.unread, 2);
assert!(matches!(summary.last.unwrap().content, meow_client::Content::Text(ref t) if t == "two"));
// Bob reads.
assert_eq!(bob.mark_read("alice").await.unwrap(), 2);
assert_eq!(bob.mark_read("alice").await.unwrap(), 0);
assert_eq!(statuses(&bob, "alice", false), vec![Status::Read, Status::Read]);
assert_eq!(bob.conversation_summary("alice").unwrap().unread, 0);
let ev = alice.sync(Duration::ZERO).await.unwrap();
assert_eq!(
ev,
+41 -14
View File
@@ -113,6 +113,13 @@ pub struct MessageView {
pub status: MessageStatus,
}
/// A conversation as listed: the contact, its latest message and unread count.
pub struct ConversationView {
pub contact: ContactView,
pub last_message: Option<MessageView>,
pub unread: u32,
}
/// One segment of a conversation, oldest message first.
pub struct HistoryPageView {
pub messages: Vec<MessageView>,
@@ -246,6 +253,24 @@ fn message_view(h: meow_client::HistoryEntry) -> MessageView {
}
}
fn contact_view(c: &MeowClient, k: &meow_client::Contact) -> Result<ContactView> {
Ok(ContactView {
id: k.id.0.clone(),
name: k.name.clone(),
my_name: k.my_name.clone(),
peer_name: k.peer.as_ref().map(|p| p.name.clone()),
status: match k.state {
meow_client::State::OfferSent => ContactStatus::OfferSent,
meow_client::State::AnswerSent => ContactStatus::AnswerSent,
meow_client::State::ConfirmSent => ContactStatus::ConfirmSent,
meow_client::State::Active => ContactStatus::Active,
},
hidden: c.is_hidden(&k.name)?,
safety_number: k.safety_number(),
created_at: k.created_at as i64,
})
}
fn server_view(s: &meow_client::ServerInfo) -> ServerView {
ServerView {
url: s.url.clone(),
@@ -421,25 +446,27 @@ impl Meow {
// ── contacts ──
pub async fn contacts(&self) -> Result<Vec<ContactView>> {
with_client!(self, |c| c.contacts().into_iter().map(|k| contact_view(c, k)).collect())
}
/// Every conversation (one per contact), most recent activity first.
pub async fn conversations(&self) -> Result<Vec<ConversationView>> {
with_client!(self, |c| {
let mut out = Vec::new();
for k in c.contacts() {
out.push(ContactView {
id: k.id.0.clone(),
name: k.name.clone(),
my_name: k.my_name.clone(),
peer_name: k.peer.as_ref().map(|p| p.name.clone()),
status: match k.state {
meow_client::State::OfferSent => ContactStatus::OfferSent,
meow_client::State::AnswerSent => ContactStatus::AnswerSent,
meow_client::State::ConfirmSent => ContactStatus::ConfirmSent,
meow_client::State::Active => ContactStatus::Active,
},
hidden: c.is_hidden(&k.name)?,
safety_number: k.safety_number(),
created_at: k.created_at as i64,
let s = c.conversation_summary(&k.name)?;
out.push(ConversationView {
contact: contact_view(c, k)?,
last_message: s.last.map(message_view),
unread: s.unread as u32,
});
}
let activity = |v: &ConversationView| {
v.last_message
.as_ref()
.map_or(v.contact.created_at * 1000, |m| m.sent_at_ms.max(m.received_at * 1000))
};
out.sort_by_key(|v| std::cmp::Reverse(activity(v)));
Ok(out)
})
}
+154 -26
View File
@@ -40,7 +40,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
default_rust_auto_opaque = RustAutoOpaqueMoi,
);
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.13.0";
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1531542945;
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1332212757;
// Section: executor
@@ -384,6 +384,50 @@ fn wire__crate__api__meow__Meow_contacts_impl(
},
)
}
fn wire__crate__api__meow__Meow_conversations_impl(
port_: flutter_rust_bridge::for_generated::MessagePort,
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
rust_vec_len_: i32,
data_len_: i32,
) {
FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec, _, _, _>(
flutter_rust_bridge::for_generated::TaskInfo {
debug_name: "Meow_conversations",
port: Some(port_),
mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
},
move || {
let message = unsafe {
flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_)
};
let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
let api_that = <RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Meow>>>::sse_decode(
&mut deserializer,
);
deserializer.end();
move |context| async move {
transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>(
(move || async move {
let mut api_that_guard = None;
let decode_indices_ = flutter_rust_bridge::for_generated::lockable_compute_decode_order(vec![
flutter_rust_bridge::for_generated::LockableOrderInfo::new(&api_that, 0, false),
]);
for i in decode_indices_ {
match i {
0 => api_that_guard = Some(api_that.lockable_decode_async_ref().await),
_ => unreachable!(),
}
}
let api_that_guard = api_that_guard.unwrap();
let output_ok = crate::api::meow::Meow::conversations(&*api_that_guard).await?;
std::result::Result::Ok(output_ok)
})()
.await,
)
}
},
)
}
fn wire__crate__api__meow__Meow_create_impl(
port_: flutter_rust_bridge::for_generated::MessagePort,
ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
@@ -1582,6 +1626,20 @@ impl SseDecode for crate::api::meow::ContactView {
}
}
impl SseDecode for crate::api::meow::ConversationView {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
let mut var_contact = <crate::api::meow::ContactView>::sse_decode(deserializer);
let mut var_lastMessage = <Option<crate::api::meow::MessageView>>::sse_decode(deserializer);
let mut var_unread = <u32>::sse_decode(deserializer);
return crate::api::meow::ConversationView {
contact: var_contact,
last_message: var_lastMessage,
unread: var_unread,
};
}
}
impl SseDecode for crate::api::meow::HistoryPageView {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -1650,6 +1708,18 @@ impl SseDecode for Vec<crate::api::meow::ContactView> {
}
}
impl SseDecode for Vec<crate::api::meow::ConversationView> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
let mut len_ = <i32>::sse_decode(deserializer);
let mut ans_ = Vec::with_capacity(len_ as usize);
for idx_ in 0..len_ {
ans_.push(<crate::api::meow::ConversationView>::sse_decode(deserializer));
}
return ans_;
}
}
impl SseDecode for Vec<Vec<u8>> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -1836,6 +1906,17 @@ impl SseDecode for Option<i64> {
}
}
impl SseDecode for Option<crate::api::meow::MessageView> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
if (<bool>::sse_decode(deserializer)) {
return Some(<crate::api::meow::MessageView>::sse_decode(deserializer));
} else {
return None;
}
}
}
impl SseDecode for Option<u32> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -1956,30 +2037,31 @@ fn pde_ffi_dispatcher_primary_impl(
5 => wire__crate__api__meow__Meow_change_password_impl(port, ptr, rust_vec_len, data_len),
6 => wire__crate__api__meow__Meow_close_impl(port, ptr, rust_vec_len, data_len),
7 => wire__crate__api__meow__Meow_contacts_impl(port, ptr, rust_vec_len, data_len),
8 => wire__crate__api__meow__Meow_create_impl(port, ptr, rust_vec_len, data_len),
9 => wire__crate__api__meow__Meow_create_invitation_impl(port, ptr, rust_vec_len, data_len),
10 => wire__crate__api__meow__Meow_events_impl(port, ptr, rust_vec_len, data_len),
11 => wire__crate__api__meow__Meow_file_impl(port, ptr, rust_vec_len, data_len),
12 => wire__crate__api__meow__Meow_finalize_invitation_impl(port, ptr, rust_vec_len, data_len),
13 => wire__crate__api__meow__Meow_flush_outbox_impl(port, ptr, rust_vec_len, data_len),
14 => wire__crate__api__meow__Meow_hide_contact_impl(port, ptr, rust_vec_len, data_len),
15 => wire__crate__api__meow__Meow_history_impl(port, ptr, rust_vec_len, data_len),
16 => wire__crate__api__meow__Meow_inspect_invitation_impl(port, ptr, rust_vec_len, data_len),
17 => wire__crate__api__meow__Meow_mark_read_impl(port, ptr, rust_vec_len, data_len),
18 => wire__crate__api__meow__Meow_nickname_impl(port, ptr, rust_vec_len, data_len),
19 => wire__crate__api__meow__Meow_open_impl(port, ptr, rust_vec_len, data_len),
20 => wire__crate__api__meow__Meow_pending_sends_impl(port, ptr, rust_vec_len, data_len),
21 => wire__crate__api__meow__Meow_publish_invitation_impl(port, ptr, rust_vec_len, data_len),
22 => wire__crate__api__meow__Meow_remove_contact_impl(port, ptr, rust_vec_len, data_len),
23 => wire__crate__api__meow__Meow_remove_server_impl(port, ptr, rust_vec_len, data_len),
24 => wire__crate__api__meow__Meow_reveal_contact_impl(port, ptr, rust_vec_len, data_len),
25 => wire__crate__api__meow__Meow_send_file_impl(port, ptr, rust_vec_len, data_len),
26 => wire__crate__api__meow__Meow_send_text_impl(port, ptr, rust_vec_len, data_len),
27 => wire__crate__api__meow__Meow_servers_impl(port, ptr, rust_vec_len, data_len),
28 => wire__crate__api__meow__Meow_set_settings_impl(port, ptr, rust_vec_len, data_len),
29 => wire__crate__api__meow__Meow_settings_impl(port, ptr, rust_vec_len, data_len),
30 => wire__crate__api__meow__Meow_unlock_impl(port, ptr, rust_vec_len, data_len),
32 => wire__crate__api__meow__init_app_impl(port, ptr, rust_vec_len, data_len),
8 => wire__crate__api__meow__Meow_conversations_impl(port, ptr, rust_vec_len, data_len),
9 => wire__crate__api__meow__Meow_create_impl(port, ptr, rust_vec_len, data_len),
10 => wire__crate__api__meow__Meow_create_invitation_impl(port, ptr, rust_vec_len, data_len),
11 => wire__crate__api__meow__Meow_events_impl(port, ptr, rust_vec_len, data_len),
12 => wire__crate__api__meow__Meow_file_impl(port, ptr, rust_vec_len, data_len),
13 => wire__crate__api__meow__Meow_finalize_invitation_impl(port, ptr, rust_vec_len, data_len),
14 => wire__crate__api__meow__Meow_flush_outbox_impl(port, ptr, rust_vec_len, data_len),
15 => wire__crate__api__meow__Meow_hide_contact_impl(port, ptr, rust_vec_len, data_len),
16 => wire__crate__api__meow__Meow_history_impl(port, ptr, rust_vec_len, data_len),
17 => wire__crate__api__meow__Meow_inspect_invitation_impl(port, ptr, rust_vec_len, data_len),
18 => wire__crate__api__meow__Meow_mark_read_impl(port, ptr, rust_vec_len, data_len),
19 => wire__crate__api__meow__Meow_nickname_impl(port, ptr, rust_vec_len, data_len),
20 => wire__crate__api__meow__Meow_open_impl(port, ptr, rust_vec_len, data_len),
21 => wire__crate__api__meow__Meow_pending_sends_impl(port, ptr, rust_vec_len, data_len),
22 => wire__crate__api__meow__Meow_publish_invitation_impl(port, ptr, rust_vec_len, data_len),
23 => wire__crate__api__meow__Meow_remove_contact_impl(port, ptr, rust_vec_len, data_len),
24 => wire__crate__api__meow__Meow_remove_server_impl(port, ptr, rust_vec_len, data_len),
25 => wire__crate__api__meow__Meow_reveal_contact_impl(port, ptr, rust_vec_len, data_len),
26 => wire__crate__api__meow__Meow_send_file_impl(port, ptr, rust_vec_len, data_len),
27 => wire__crate__api__meow__Meow_send_text_impl(port, ptr, rust_vec_len, data_len),
28 => wire__crate__api__meow__Meow_servers_impl(port, ptr, rust_vec_len, data_len),
29 => wire__crate__api__meow__Meow_set_settings_impl(port, ptr, rust_vec_len, data_len),
30 => wire__crate__api__meow__Meow_settings_impl(port, ptr, rust_vec_len, data_len),
31 => wire__crate__api__meow__Meow_unlock_impl(port, ptr, rust_vec_len, data_len),
33 => wire__crate__api__meow__init_app_impl(port, ptr, rust_vec_len, data_len),
_ => unreachable!(),
}
}
@@ -1992,7 +2074,7 @@ fn pde_ffi_dispatcher_sync_impl(
) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
// Codec=Pde (Serialization + dispatch), see doc to use other codecs
match func_id {
31 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
32 => wire__crate__api__meow__core_version_impl(ptr, rust_vec_len, data_len),
_ => unreachable!(),
}
}
@@ -2054,6 +2136,23 @@ impl flutter_rust_bridge::IntoIntoDart<crate::api::meow::ContactView> for crate:
}
}
// Codec=Dco (DartCObject based), see doc to use other codecs
impl flutter_rust_bridge::IntoDart for crate::api::meow::ConversationView {
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
[
self.contact.into_into_dart().into_dart(),
self.last_message.into_into_dart().into_dart(),
self.unread.into_into_dart().into_dart(),
]
.into_dart()
}
}
impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive for crate::api::meow::ConversationView {}
impl flutter_rust_bridge::IntoIntoDart<crate::api::meow::ConversationView> for crate::api::meow::ConversationView {
fn into_into_dart(self) -> crate::api::meow::ConversationView {
self
}
}
// Codec=Dco (DartCObject based), see doc to use other codecs
impl flutter_rust_bridge::IntoDart for crate::api::meow::HistoryPageView {
fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
[
@@ -2344,6 +2443,15 @@ impl SseEncode for crate::api::meow::ContactView {
}
}
impl SseEncode for crate::api::meow::ConversationView {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
<crate::api::meow::ContactView>::sse_encode(self.contact, serializer);
<Option<crate::api::meow::MessageView>>::sse_encode(self.last_message, serializer);
<u32>::sse_encode(self.unread, serializer);
}
}
impl SseEncode for crate::api::meow::HistoryPageView {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -2397,6 +2505,16 @@ impl SseEncode for Vec<crate::api::meow::ContactView> {
}
}
impl SseEncode for Vec<crate::api::meow::ConversationView> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
<i32>::sse_encode(self.len() as _, serializer);
for item in self {
<crate::api::meow::ConversationView>::sse_encode(item, serializer);
}
}
}
impl SseEncode for Vec<Vec<u8>> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -2561,6 +2679,16 @@ impl SseEncode for Option<i64> {
}
}
impl SseEncode for Option<crate::api::meow::MessageView> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
<bool>::sse_encode(self.is_some(), serializer);
if let Some(value) = self {
<crate::api::meow::MessageView>::sse_encode(value, serializer);
}
}
}
impl SseEncode for Option<u32> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {