mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 17:36:29 +03:00
cargo fmt
This commit is contained in:
19
src/qr.rs
19
src/qr.rs
@@ -453,7 +453,7 @@ async fn decode_mailto(context: &Context, qr: &str) -> Result<Qr> {
|
|||||||
let payload = &qr[MAILTO_SCHEME.len()..];
|
let payload = &qr[MAILTO_SCHEME.len()..];
|
||||||
|
|
||||||
let (addr, query) = if let Some(query_index) = payload.find('?') {
|
let (addr, query) = if let Some(query_index) = payload.find('?') {
|
||||||
(&payload[..query_index], &payload[query_index+1..])
|
(&payload[..query_index], &payload[query_index + 1..])
|
||||||
} else {
|
} else {
|
||||||
(payload, "")
|
(payload, "")
|
||||||
};
|
};
|
||||||
@@ -478,7 +478,7 @@ async fn decode_mailto(context: &Context, qr: &str) -> Result<Qr> {
|
|||||||
if subject.is_empty() {
|
if subject.is_empty() {
|
||||||
body.to_string()
|
body.to_string()
|
||||||
} else {
|
} else {
|
||||||
subject + "\n" + body
|
subject + "\n" + body
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
subject
|
subject
|
||||||
@@ -491,7 +491,13 @@ async fn decode_mailto(context: &Context, qr: &str) -> Result<Qr> {
|
|||||||
|
|
||||||
let addr = normalize_address(addr)?;
|
let addr = normalize_address(addr)?;
|
||||||
let name = "".to_string();
|
let name = "".to_string();
|
||||||
Qr::from_address(context, name, addr, if draft.is_empty() { None } else { Some(draft) }).await
|
Qr::from_address(
|
||||||
|
context,
|
||||||
|
name,
|
||||||
|
addr,
|
||||||
|
if draft.is_empty() { None } else { Some(draft) },
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Extract address for the smtp scheme.
|
/// Extract address for the smtp scheme.
|
||||||
@@ -567,7 +573,12 @@ async fn decode_vcard(context: &Context, qr: &str) -> Result<Qr> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Qr {
|
impl Qr {
|
||||||
pub async fn from_address(context: &Context, name: String, addr: String, draft: Option<String>) -> Result<Self> {
|
pub async fn from_address(
|
||||||
|
context: &Context,
|
||||||
|
name: String,
|
||||||
|
addr: String,
|
||||||
|
draft: Option<String>,
|
||||||
|
) -> Result<Self> {
|
||||||
let (contact_id, _) =
|
let (contact_id, _) =
|
||||||
Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan).await?;
|
Contact::add_or_lookup(context, &name, &addr, Origin::UnhandledQrScan).await?;
|
||||||
Ok(Qr::Addr { contact_id, draft })
|
Ok(Qr::Addr { contact_id, draft })
|
||||||
|
|||||||
Reference in New Issue
Block a user