Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 15:06:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename repl_msg_by_error into replace_msg_by_error

Browse Source 
This function has been named like this since it was a C function.
`repl` is unclear because it may stand for `reply`
as well as `replace`.
This commit is contained in:
link2xt
2023-10-28 11:25:03 +00:00
parent aecf7729d8
commit 94d5e86d4f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mimeparser.rs
View File

@@ -1358,7 +1358,7 @@ impl MimeMessage {
self.get_mailinglist_header().is_some() self.get_mailinglist_header().is_some()
} }
pub fn repl_msg_by_error(&mut self, error_msg: &str) { pub fn replace_msg_by_error(&mut self, error_msg: &str) {
self.is_system_message = SystemMessage::Unknown; self.is_system_message = SystemMessage::Unknown;
if let Some(part) = self.parts.first_mut() { if let Some(part) = self.parts.first_mut() {
part.typ = Viewtype::Text; part.typ = Viewtype::Text;

13
src/receive_imf.rs
View File

@@ -637,7 +637,7 @@ async fn add_parts(
chat_id = None; chat_id = None;
} else { } else {
let s = stock_str::unknown_sender_for_chat(context).await; let s = stock_str::unknown_sender_for_chat(context).await;
mime_parser.repl_msg_by_error(&s); mime_parser.replace_msg_by_error(&s);
} }
} else { } else {
// In non-protected chats, just mark the sender as overridden. Therefore, the UI will prepend `~` // In non-protected chats, just mark the sender as overridden. Therefore, the UI will prepend `~`
@@ -1055,7 +1055,7 @@ async fn add_parts(
{ {
warn!(context, "Verification problem: {err:#}."); warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details"); let s = format!("{err}. See 'Info' for more details");
mime_parser.repl_msg_by_error(&s); mime_parser.replace_msg_by_error(&s);
} }
} }
} }
@@ -1596,7 +1596,7 @@ async fn create_or_lookup_group(
{ {
warn!(context, "Verification problem: {err:#}."); warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details"); let s = format!("{err}. See 'Info' for more details");
mime_parser.repl_msg_by_error(&s); mime_parser.replace_msg_by_error(&s);
} }
ProtectionStatus::Protected ProtectionStatus::Protected
} else { } else {
@@ -1758,7 +1758,7 @@ async fn apply_group_changes(
{ {
warn!(context, "Verification problem: {err:#}."); warn!(context, "Verification problem: {err:#}.");
let s = format!("{err}. See 'Info' for more details"); let s = format!("{err}. See 'Info' for more details");
mime_parser.repl_msg_by_error(&s); mime_parser.replace_msg_by_error(&s);
} }
if !chat.is_protected() { if !chat.is_protected() {
@@ -2311,7 +2311,7 @@ async fn has_verified_encryption(
LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ", LEFT JOIN acpeerstates ps ON c.addr=ps.addr WHERE c.id IN({}) ",
sql::repeat_vars(to_ids.len()) sql::repeat_vars(to_ids.len())
), ),
rusqlite::params_from_iter(to_ids), rusqlite::params_from_iter(&to_ids),
|row| { |row| {
let to_addr: String = row.get(0)?; let to_addr: String = row.get(0)?;
let is_verified: i32 = row.get(1).unwrap_or(0); let is_verified: i32 = row.get(1).unwrap_or(0);
@@ -2364,8 +2364,7 @@ async fn has_verified_encryption(
} }
if !is_verified { if !is_verified {
return Ok(NotVerified(format!( return Ok(NotVerified(format!(
"{} is not a member of this protected chat", "{to_addr} is not a member of this protected chat member list {to_ids:?}",
to_addr
))); )));
} }
} }