diff --git a/bin/chat-cli/README.md b/bin/chat-cli/README.md index 4d88ec5..b3800d0 100644 --- a/bin/chat-cli/README.md +++ b/bin/chat-cli/README.md @@ -54,8 +54,8 @@ cargo run -p chat-cli -- --name bob --transport file ### Establishing a connection -1. In Alice's terminal, type `/intro` — the bundle is copied to your clipboard automatically. -2. In Bob's terminal, type `/connect `. +1. In Alice's terminal, type `/account` — her address is copied to the clipboard automatically. +2. In Bob's terminal, type `/connect `. 3. Bob's "Hello!" message appears in Alice's terminal. Both can now chat. ### Optional: KeyPackage registry @@ -97,8 +97,8 @@ The registry is a throwaway testnet helper; v0.3 replaces it with a | Command | Description | |---------|-------------| | `/help` | Show available commands | -| `/intro` | Generate your introduction bundle (copies to clipboard) | -| `/connect ` | Connect to a user using their introduction bundle | +| `/account` | Show your account address (copies to clipboard) | +| `/connect
` | Connect to a user using their address | | `/chats` | List all established chats | | `/switch ` | Switch active chat | | `/delete ` | Delete a chat session | diff --git a/bin/chat-cli/src/app.rs b/bin/chat-cli/src/app.rs index 30b9e24..5791522 100644 --- a/bin/chat-cli/src/app.rs +++ b/bin/chat-cli/src/app.rs @@ -241,7 +241,7 @@ where match command { "/help" => { self.add_system_message("── Commands ──"); - self.add_system_message("/intro - Show your address"); + self.add_system_message("/account - Show your account address"); self.add_system_message("/connect
- Connect using an address"); self.add_system_message("/nickname - Name the active chat"); self.add_system_message("/chats - List all chats"); @@ -252,17 +252,17 @@ where self.add_system_message("/quit or Esc or Ctrl+C - Exit"); Ok(Some("Help displayed".to_string())) } - "/intro" => { + "/account" => { let address = self.client.addr().to_string(); - self.add_system_message("── Your Address ──"); + self.add_system_message("── Your Account Address ──"); self.add_system_message(&address); let clipboard_msg = match Clipboard::new().and_then(|mut cb| cb.set_text(&address)) { - Ok(()) => "Address copied to clipboard! Share it, then /connect their address.", - Err(_) => "Share this address with others to connect!", + Ok(()) => "Address copied to clipboard. Share it so others can reach you.", + Err(_) => "Share this address so others can reach you.", }; self.add_system_message(clipboard_msg); - Ok(Some("Address shown".to_string())) + Ok(Some("Account address shown".to_string())) } "/connect" => { if args.is_empty() { diff --git a/core/conversations/src/conversation/group_v1.rs b/core/conversations/src/conversation/group_v1.rs index 665a9f4..6e4b5d3 100644 --- a/core/conversations/src/conversation/group_v1.rs +++ b/core/conversations/src/conversation/group_v1.rs @@ -191,7 +191,7 @@ impl GroupV1Convo { self.send_payload(cx, msg_bytes) } - // Publish outboubound payloads to the DeliveryService + // Publish outbound payloads to the DeliveryService fn send_payload( &mut self, cx: &mut ServiceContext, @@ -329,7 +329,7 @@ impl GroupConvo for GroupV1Convo { members: &[IdentIdRef], ) -> Result<(), ChatError> { if members.len() > 50 { - // This is a temporary limit that originates from the the De-MLS epoch time. + // This is a temporary limit that originates from the De-MLS epoch time. return Err(ChatError::Protocol( "Cannot add more than 50 Members at a time".into(), )); diff --git a/core/conversations/src/inbox_v2/identity.rs b/core/conversations/src/inbox_v2/identity.rs index 7691cc4..0964c26 100644 --- a/core/conversations/src/inbox_v2/identity.rs +++ b/core/conversations/src/inbox_v2/identity.rs @@ -11,8 +11,8 @@ use crate::IdentityProvider; /// A Wrapper for an IdentityProvider which provides MLS specific functionality /// -/// This type stops OpenMLS internal from leaking outside of the crate. -/// Developers provider a simple IdentitityProvider, and Signer and Credential generation +/// This type stops OpenMLS internal from leaking outside the crate. +/// Developers provider a simple IdentityProvider, and Signer and Credential generation /// is provided pub struct MlsIdentityProvider(T); @@ -55,7 +55,7 @@ impl IdentityProvider for MlsIdentityProvider { } } -// Implement Signer directly for MlsIdentityProvider, so that openmls Signer contstraint +// Implement Signer directly for MlsIdentityProvider, so that openmls Signer constraint // does not leave the module. impl Signer for MlsIdentityProvider { fn sign(&self, payload: &[u8]) -> Result, SignerError> {