Skip to content

Commit

Permalink
fixed bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronvoell committed Sep 21, 2024
1 parent 4090246 commit 6fb0385
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions xmtp_mls/src/groups/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ impl MlsGroup {
added_by_inbox,
welcome_id,
Purpose::Conversation,
dm_inbox_id,
)
}
ConversationType::Sync => StoredGroup::new_from_welcome(
Expand Down Expand Up @@ -1110,11 +1111,8 @@ impl MlsGroup {
.unwrap()
});
let mutable_metadata = custom_mutable_metadata.unwrap_or_else(|| {
build_dm_mutable_metadata_extension_default(
context.inbox_id(),
dm_target_inbox_id.clone(),
)
.unwrap()
build_dm_mutable_metadata_extension_default(context.inbox_id(), &dm_target_inbox_id)
.unwrap()
});
let group_membership = custom_group_membership
.unwrap_or_else(|| build_starting_group_membership_extension(context.inbox_id(), 0));
Expand Down Expand Up @@ -1145,6 +1143,7 @@ impl MlsGroup {
now_ns(),
GroupMembershipState::Allowed, // Use Allowed as default for tests
context.inbox_id(),
Some(dm_target_inbox_id),
);

stored_group.store(provider.conn_ref())?;
Expand Down

0 comments on commit 6fb0385

Please sign in to comment.