diff --git a/deltachat-ffi/deltachat.h b/deltachat-ffi/deltachat.h index ea68725cb..c330f5510 100644 --- a/deltachat-ffi/deltachat.h +++ b/deltachat-ffi/deltachat.h @@ -3950,7 +3950,7 @@ int64_t dc_msg_get_received_timestamp (const dc_msg_t* msg); * Get the message time used for sorting. * This function returns the timestamp that is used for sorting the message * into lists as returned e.g. by dc_get_chat_msgs(). - * This may be the reveived time, the sending time or another time. + * This may be the received time, the sending time or another time. * * To get the receiving time, use dc_msg_get_received_timestamp(). * To get the sending time, use dc_msg_get_timestamp(). diff --git a/deltachat-jsonrpc/typescript/test/online.ts b/deltachat-jsonrpc/typescript/test/online.ts index 3ab6cb820..c9fa4077a 100644 --- a/deltachat-jsonrpc/typescript/test/online.ts +++ b/deltachat-jsonrpc/typescript/test/online.ts @@ -148,7 +148,7 @@ describe("online tests", function () { waitForEvent(dc, "IncomingMsg", accountId1), ]); dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message"); - // Check if answer arives at A and if it is encrypted + // Check if answer arrives at A and if it is encrypted await eventPromise2; const messageId = ( diff --git a/draft/aeap-mvp.md b/draft/aeap-mvp.md index 94ac3c03e..040125f57 100644 --- a/draft/aeap-mvp.md +++ b/draft/aeap-mvp.md @@ -108,7 +108,7 @@ The most obvious alternative would be to create a new contact with the new addre #### Upsides: - With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally. - (Also, less important: Slightly faster transition: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.) -- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.) +- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't waste that much development time.) [full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161) diff --git a/node/lib/context.ts b/node/lib/context.ts index 4c926ba78..a9cf9c687 100644 --- a/node/lib/context.ts +++ b/node/lib/context.ts @@ -36,7 +36,7 @@ export class Context extends EventEmitter { } } - /** Opens a stanalone context (without an account manager) + /** Opens a standalone context (without an account manager) * automatically starts the event handler */ static open(cwd: string): Context { const dbFile = join(cwd, 'db.sqlite') diff --git a/spec.md b/spec.md index b12a75464..ea34862aa 100644 --- a/spec.md +++ b/spec.md @@ -43,7 +43,7 @@ the `Subject` header SHOULD be `Message from `. Replies to messages MAY follow the typical `Re:`-format. The body MAY contain text which MUST have the content type `text/plain` -or `mulipart/alternative` containing `text/plain`. +or `multipart/alternative` containing `text/plain`. The text MAY be divided into a user-text-part and a footer-part using the line `-- ` (minus, minus, space, lineend). diff --git a/src/chat.rs b/src/chat.rs index 5f2580cbf..378a19ba4 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -2337,7 +2337,7 @@ pub async fn send_msg_sync(context: &Context, chat_id: ChatId, msg: &mut Message } async fn send_msg_inner(context: &Context, chat_id: ChatId, msg: &mut Message) -> Result { - // protect all system messages againts RTLO attacks + // protect all system messages against RTLO attacks if msg.is_system_message() { msg.text = strip_rtlo_characters(&msg.text); } diff --git a/src/context.rs b/src/context.rs index 210eddc0d..22dc265c7 100644 --- a/src/context.rs +++ b/src/context.rs @@ -38,7 +38,7 @@ use crate::tools::{duration_to_str, time}; /// /// # Examples /// -/// Creating a new unecrypted database: +/// Creating a new unencrypted database: /// /// ``` /// # let rt = tokio::runtime::Runtime::new().unwrap(); diff --git a/src/imap.rs b/src/imap.rs index 970273a5f..6c41244aa 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -637,7 +637,7 @@ impl Imap { ); // RFC 3501 says STATUS command SHOULD NOT be used - // on the currently seleced mailbox because the same + // on the currently selected mailbox because the same // information can be obtained by other means, // such as reading SELECT response. // diff --git a/src/mimefactory.rs b/src/mimefactory.rs index b14e6a99b..1a016f00a 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -2341,7 +2341,7 @@ mod tests { // Now Bob can send an encrypted message to Alice. let mut msg = Message::new(Viewtype::File); // Long messages are truncated and MimeMessage::decoded_data is set for them. We need - // decoded_data to check presense of the necessary headers. + // decoded_data to check presence of the necessary headers. msg.set_text("a".repeat(constants::DC_DESIRED_TEXT_LEN + 1)); msg.set_file_from_bytes(&bob, "foo.bar", "content".as_bytes(), None) .await?; diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 1bd0fb9a0..d1cfd5fa2 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -1878,7 +1878,7 @@ fn get_mime_type( } else { // Enacapsulated messages, see // Also used as part "message/disposition-notification" of "multipart/report", which, however, will - // be handled separatedly. + // be handled separately. // I've not seen any messages using this, so we do not attach these parts (maybe they're used to attach replies, // which are unwanted at all). // For now, we skip these parts at all; if desired, we could return DcMimeType::File/DC_MSG_File diff --git a/src/peerstate.rs b/src/peerstate.rs index 8a08a175d..e41752541 100644 --- a/src/peerstate.rs +++ b/src/peerstate.rs @@ -21,7 +21,7 @@ use crate::stock_str; /// Type of the public key stored inside the peerstate. #[derive(Debug)] pub enum PeerstateKeyType { - /// Pubilc key sent in the `Autocrypt-Gossip` header. + /// Public key sent in the `Autocrypt-Gossip` header. GossipKey, /// Public key sent in the `Autocrypt` header. diff --git a/src/stock_str.rs b/src/stock_str.rs index ea19a2a72..0dc305107 100644 --- a/src/stock_str.rs +++ b/src/stock_str.rs @@ -1550,7 +1550,7 @@ mod tests { let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap(); assert_eq!(chats.len(), 0); - // a subsequent call to update_device_chats() must not re-add manally deleted messages or chats + // a subsequent call to update_device_chats() must not re-add manually deleted messages or chats t.update_device_chats().await.unwrap(); let chats = Chatlist::try_load(&t, 0, None, None).await.unwrap(); assert_eq!(chats.len(), 0); diff --git a/src/tools.rs b/src/tools.rs index 0e3ea3076..338570f7a 100644 --- a/src/tools.rs +++ b/src/tools.rs @@ -268,7 +268,7 @@ pub(crate) fn create_id() -> String { /// Function generates a Message-ID that can be used for a new outgoing message. /// - this function is called for all outgoing messages. /// - the message ID should be globally unique -/// - do not add a counter or any private data as this leaks information unncessarily +/// - do not add a counter or any private data as this leaks information unnecessarily pub(crate) fn create_outgoing_rfc724_mid(grpid: Option<&str>, from_addr: &str) -> String { let hostname = from_addr .find('@') @@ -700,7 +700,7 @@ pub(crate) fn buf_decompress(buf: &[u8]) -> Result> { } const RTLO_CHARACTERS: [char; 5] = ['\u{202A}', '\u{202B}', '\u{202C}', '\u{202D}', '\u{202E}']; -/// This method strips all occurances of the RTLO Unicode character. +/// This method strips all occurrences of the RTLO Unicode character. /// [Why is this needed](https://github.com/deltachat/deltachat-core-rust/issues/3479)? pub(crate) fn strip_rtlo_characters(input_str: &str) -> String { input_str.replace(|char| RTLO_CHARACTERS.contains(&char), "")