Skip to content

Commit

Permalink
Remove some ListConversationsOptions (node + WASM) (#1688)
Browse files Browse the repository at this point in the history 
* Update ListConversationOptions (WASM)

* Update ListConversationOptions (Node)

* Add more delays in node bindings tests
  • Loading branch information
@rygine
rygine authored Mar 3, 2025
1 parent 95fc87f commit 0e02d19
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 54 deletions.
47 changes: 33 additions & 14 deletions bindings_node/src/conversations.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,19 @@ impl From<GroupMembershipState> for XmtpGroupMembershipState {
#[napi(object)]
#[derive(Default)]
pub struct ListConversationsOptions {
pub allowed_states: Option<Vec<GroupMembershipState>>,
pub consent_states: Option<Vec<ConsentState>>,
pub created_after_ns: Option<i64>,
pub created_before_ns: Option<i64>,
pub include_duplicate_dms: bool,
pub limit: Option<i64>,
pub conversation_type: Option<ConversationType>,
}

impl From<ListConversationsOptions> for GroupQueryArgs {
fn from(opts: ListConversationsOptions) -> GroupQueryArgs {
GroupQueryArgs {
allowed_states: opts
.allowed_states
.map(|vec| vec.into_iter().map(Into::into).collect()),
consent_states: opts
.consent_states
.map(|vec| vec.into_iter().map(Into::into).collect()),
conversation_type: opts.conversation_type.map(Into::into),
created_before_ns: opts.created_before_ns,
created_after_ns: opts.created_after_ns,
include_duplicate_dms: opts.include_duplicate_dms,
Expand Down Expand Up @@ -534,21 +528,46 @@ impl Conversations {
&self,
opts: Option<ListConversationsOptions>,
) -> Result<Vec<ConversationListItem>> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
let convo_list: Vec<ConversationListItem> = self
.inner_client
.list_conversations(
GroupQueryArgs::from(opts.unwrap_or_default())
.conversation_type(XmtpConversationType::Group),
)
.map_err(ErrorWrapper::from)?
.into_iter()
.map(|conversation_item| ConversationListItem {
conversation: conversation_item.group.into(),
last_message: conversation_item
.last_message
.map(|stored_message| stored_message.into()),
})
.collect();

Ok(convo_list)
}

#[napi]
pub fn list_dms(
&self,
opts: Option<ListConversationsOptions>,
) -> Result<Vec<ConversationListItem>> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
let convo_list: Vec<ConversationListItem> = self
.inner_client
.list_conversations(
GroupQueryArgs::from(opts.unwrap_or_default()).conversation_type(XmtpConversationType::Dm),
)
.map_err(ErrorWrapper::from)?
.into_iter()
.map(|conversation_item| ConversationListItem {
conversation: conversation_item.group.into(),
last_message: conversation_item
.last_message
.map(|stored_message| stored_message.into()),
})
.collect();

Ok(convo_list)
}

#[napi]
Expand Down
28 changes: 14 additions & 14 deletions bindings_node/test/Conversation.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ describe.concurrent('Conversation', () => {

// create message disappearing settings so that messages are deleted after 1 second
const messageDisappearingSettings: MessageDisappearingSettings = {
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
}

// create a group with message disappearing settings
Expand All @@ -434,8 +434,8 @@ describe.concurrent('Conversation', () => {

// verify that the message disappearing settings are set and enabled
expect(conversation.messageDisappearingSettings()).toEqual({
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
})
expect(conversation.isMessageDisappearingEnabled()).toBe(true)

Expand All @@ -455,13 +455,13 @@ describe.concurrent('Conversation', () => {

// verify that the message disappearing settings are set and enabled
expect(conversation2!.messageDisappearingSettings()).toEqual({
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
})
expect(conversation2!.isMessageDisappearingEnabled()).toBe(true)

// wait for the messages to be deleted
await sleep(3000)
await sleep(5000)

// verify that the messages are deleted
expect((await conversation.findMessages()).length).toBe(1)
Expand Down Expand Up @@ -512,8 +512,8 @@ describe.concurrent('Conversation', () => {

// create message disappearing settings so that messages are deleted after 1 second
const messageDisappearingSettings: MessageDisappearingSettings = {
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
}

// create a group with message disappearing settings
Expand All @@ -525,8 +525,8 @@ describe.concurrent('Conversation', () => {

// verify that the message disappearing settings are set and enabled
expect(conversation.messageDisappearingSettings()).toEqual({
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
})
expect(conversation.isMessageDisappearingEnabled()).toBe(true)

Expand All @@ -546,13 +546,13 @@ describe.concurrent('Conversation', () => {

// verify that the message disappearing settings are set and enabled
expect(conversation2!.messageDisappearingSettings()).toEqual({
fromNs: 2_000_000,
inNs: 2_000_000,
fromNs: 5_000_000,
inNs: 5_000_000,
})
expect(conversation2!.isMessageDisappearingEnabled()).toBe(true)

// wait for the messages to be deleted
await sleep(3000)
await sleep(5000)

// verify that the messages are deleted
expect((await conversation.findMessages()).length).toBe(1)
Expand Down
60 changes: 34 additions & 26 deletions bindings_wasm/src/conversations.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,64 +77,47 @@ impl From<GroupMembershipState> for XmtpGroupMembershipState {
#[wasm_bindgen(getter_with_clone)]
#[derive(Default)]
pub struct ListConversationsOptions {
#[wasm_bindgen(js_name = allowedStates)]
pub allowed_states: Option<Vec<GroupMembershipState>>,
#[wasm_bindgen(js_name = consentStates)]
pub consent_states: Option<Vec<ConsentState>>,
#[wasm_bindgen(js_name = conversationType)]
pub conversation_type: Option<ConversationType>,
#[wasm_bindgen(js_name = createdAfterNs)]
pub created_after_ns: Option<i64>,
#[wasm_bindgen(js_name = createdBeforeNs)]
pub created_before_ns: Option<i64>,
#[wasm_bindgen(js_name = includeDuplicateDms)]
pub include_duplicate_dms: bool,
#[wasm_bindgen(js_name = includeSyncGroups)]
pub include_sync_groups: bool,
pub limit: Option<i64>,
}

impl From<ListConversationsOptions> for GroupQueryArgs {
fn from(opts: ListConversationsOptions) -> GroupQueryArgs {
GroupQueryArgs {
allowed_states: opts
.allowed_states
.map(|states| states.into_iter().map(From::from).collect()),
consent_states: opts
.consent_states
.map(|states| states.into_iter().map(From::from).collect()),
conversation_type: opts.conversation_type.map(Into::into),
created_after_ns: opts.created_after_ns,
created_before_ns: opts.created_before_ns,
include_duplicate_dms: opts.include_duplicate_dms,
include_sync_groups: opts.include_sync_groups,
limit: opts.limit,
..Default::default()
}
}
}

#[wasm_bindgen]
impl ListConversationsOptions {
#[wasm_bindgen(constructor)]
#[allow(clippy::too_many_arguments)]
pub fn new(
allowed_states: Option<Vec<GroupMembershipState>>,
consent_states: Option<Vec<ConsentState>>,
conversation_type: Option<ConversationType>,
created_after_ns: Option<i64>,
created_before_ns: Option<i64>,
include_duplicate_dms: bool,
include_sync_groups: bool,
limit: Option<i64>,
) -> Self {
Self {
allowed_states,
consent_states,
conversation_type,
created_after_ns,
created_before_ns,
include_duplicate_dms,
include_sync_groups,
limit,
}
}
Expand Down Expand Up @@ -569,18 +552,43 @@ impl Conversations {
&self,
opts: Option<ListConversationsOptions>,
) -> Result<js_sys::Array, JsError> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Group),
..opts.unwrap_or_default()
}))
let convo_list: js_sys::Array = self
.inner_client
.list_conversations(
GroupQueryArgs::from(opts.unwrap_or_default())
.conversation_type(XmtpConversationType::Group),
)
.map_err(|e| JsError::new(format!("{}", e).as_str()))?
.into_iter()
.map(|group| {
JsValue::from(ConversationListItem::new(
group.group.into(),
group.last_message.map(|m| m.into()),
))
})
.collect();

Ok(convo_list)
}

#[wasm_bindgen(js_name = listDms)]
pub fn list_dms(&self, opts: Option<ListConversationsOptions>) -> Result<js_sys::Array, JsError> {
self.list(Some(ListConversationsOptions {
conversation_type: Some(ConversationType::Dm),
..opts.unwrap_or_default()
}))
let convo_list: js_sys::Array = self
.inner_client
.list_conversations(
GroupQueryArgs::from(opts.unwrap_or_default()).conversation_type(XmtpConversationType::Dm),
)
.map_err(|e| JsError::new(format!("{}", e).as_str()))?
.into_iter()
.map(|group| {
JsValue::from(ConversationListItem::new(
group.group.into(),
group.last_message.map(|m| m.into()),
))
})
.collect();

Ok(convo_list)
}

#[wasm_bindgen(js_name = getHmacKeys)]
Expand Down

0 comments on commit 0e02d19

Please sign in to comment.