Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ability to order messages #1164

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+46 −9
Open

Add ability to order messages #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15dd76e
add ability to specify the order of the messages so that limit works …
nplasterer Oct 22, 2024
bab6f9d
make sure limit gets applied last
nplasterer Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions bindings_ffi/src/mls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use xmtp_mls::{
},
AbortHandle, GenericStreamHandle, StreamHandle,
};
use xmtp_proto::xmtp::mls::api::v1::SortDirection;

pub type RustXmtpClient = MlsClient<TonicApiClient>;

Expand Down Expand Up @@ -1112,12 +1113,28 @@ impl From<FfiConsentEntityType> for ConsentType {
}
}

#[derive(uniffi::Enum, Clone)]
pub enum FfiDirection {
Ascending,
Descending,
}

impl From<FfiDirection> for SortDirection {
fn from(direction: FfiDirection) -> Self {
match direction {
FfiDirection::Ascending => SortDirection::Ascending,
FfiDirection::Descending => SortDirection::Descending,
}
}
}

#[derive(uniffi::Record, Clone, Default)]
pub struct FfiListMessagesOptions {
pub sent_before_ns: Option<i64>,
pub sent_after_ns: Option<i64>,
pub limit: Option<i64>,
pub delivery_status: Option<FfiDeliveryStatus>,
pub direction: Option<FfiDirection>,
}

#[derive(uniffi::Record, Clone, Default)]
Expand Down Expand Up @@ -1200,15 +1217,14 @@ impl FfiConversation {
self.created_at_ns,
);

let delivery_status = opts.delivery_status.map(|status| status.into());

let messages: Vec<FfiMessage> = group
.find_messages(
None,
opts.sent_before_ns,
opts.sent_after_ns,
delivery_status,
opts.delivery_status.into(),
opts.limit,
opts.direction.into(),
)?
.into_iter()
.map(|msg| msg.into())
Expand Down
4 changes: 3 additions & 1 deletion xmtp_mls/src/groups/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ use xmtp_id::InboxId;
use xmtp_proto::xmtp::mls::{
api::v1::{
group_message::{Version as GroupMessageVersion, V1 as GroupMessageV1},
GroupMessage,
GroupMessage, SortDirection,
},
message_contents::{
plaintext_envelope::{Content, V1},
Expand Down Expand Up @@ -671,6 +671,7 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
sent_after_ns: Option<i64>,
delivery_status: Option<DeliveryStatus>,
limit: Option<i64>,
direction: Option<SortDirection>,
) -> Result<Vec<StoredGroupMessage>, GroupError> {
let conn = self.context().store().conn()?;
let messages = conn.get_group_messages(
Expand All @@ -680,6 +681,7 @@ impl<ScopedClient: ScopedGroupClient> MlsGroup<ScopedClient> {
kind,
delivery_status,
limit,
direction,
)?;

Ok(messages)
Expand Down
29 changes: 24 additions & 5 deletions xmtp_mls/src/storage/encrypted_store/group_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use diesel::{
sql_types::Integer,
};
use serde::{Deserialize, Serialize};
use xmtp_proto::xmtp::message_api::v1::SortDirection;

use super::{
db_connection::DbConnection,
Expand Down Expand Up @@ -118,9 +119,9 @@ impl DbConnection {
kind: Option<GroupMessageKind>,
delivery_status: Option<DeliveryStatus>,
limit: Option<i64>,
direction: Option<SortDirection>,
) -> Result<Vec<StoredGroupMessage>, StorageError> {
let mut query = dsl::group_messages
.order(dsl::sent_at_ns.asc())
.filter(dsl::group_id.eq(group_id.as_ref()))
.into_boxed();

Expand All @@ -140,6 +141,14 @@ impl DbConnection {
query = query.filter(dsl::delivery_status.eq(status));
}

if let Some(dir) = direction {
query = match dir {
SortDirection::Ascending => query.order(dsl::sent_at_ns.asc()),
SortDirection::Descending => query.order(dsl::sent_at_ns.desc()),
SortDirection::Unspecified => query,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need Unspecified if the direction argument is optional?

};
}

if let Some(limit) = limit {
query = query.limit(limit);
}
Expand Down Expand Up @@ -299,7 +308,7 @@ pub(crate) mod tests {
assert_eq!(count, 50);

let messages = conn
.get_group_messages(&group.id, None, None, None, None, None)
.get_group_messages(&group.id, None, None, None, None, None, None)
.unwrap();

assert_eq!(messages.len(), 50);
Expand All @@ -326,18 +335,26 @@ pub(crate) mod tests {
];
assert_ok!(messages.store(conn));
let message = conn
.get_group_messages(&group.id, Some(1_000), Some(100_000), None, None, None)
.get_group_messages(
&group.id,
Some(1_000),
Some(100_000),
None,
None,
None,
None,
)
.unwrap();
assert_eq!(message.len(), 1);
assert_eq!(message.first().unwrap().sent_at_ns, 10_000);

let messages = conn
.get_group_messages(&group.id, None, Some(100_000), None, None, None)
.get_group_messages(&group.id, None, Some(100_000), None, None, None, None)
.unwrap();
assert_eq!(messages.len(), 2);

let messages = conn
.get_group_messages(&group.id, Some(10_000), None, None, None, None)
.get_group_messages(&group.id, Some(10_000), None, None, None, None, None)
.unwrap();
assert_eq!(messages.len(), 2);
})
Expand Down Expand Up @@ -381,6 +398,7 @@ pub(crate) mod tests {
Some(GroupMessageKind::Application),
None,
None,
None,
)
.unwrap();
assert_eq!(application_messages.len(), 15);
Expand All @@ -393,6 +411,7 @@ pub(crate) mod tests {
Some(GroupMessageKind::MembershipChange),
None,
None,
None,
)
.unwrap();
assert_eq!(membership_changes.len(), 15);
Expand Down
Loading