melib/jmap: fix jmap build with isahc 1.7.2
parent
b716e4383e
commit
7fca5f01ef
|
@ -35,7 +35,7 @@ uuid = { version = "^1", features = ["serde", "v4", "v5"] }
|
|||
|
||||
unicode-segmentation = { version = "1.2.1", optional = true }
|
||||
libc = {version = "0.2.125", features = ["extra_traits",]}
|
||||
isahc = { version = "^1.7", optional = true, default-features = false, features = ["http2", "json", "text-decoding"]}
|
||||
isahc = { version = "^1.7.2", optional = true, default-features = false, features = ["http2", "json", "text-decoding"]}
|
||||
serde_json = { version = "1.0", optional = true, features = ["raw_value",] }
|
||||
smallvec = { version = "^1.5.0", features = ["serde", ] }
|
||||
nix = "^0.24"
|
||||
|
|
|
@ -27,8 +27,7 @@ use crate::error::{MeliError, Result};
|
|||
use crate::Collection;
|
||||
use futures::lock::Mutex as FutureMutex;
|
||||
use isahc::config::RedirectPolicy;
|
||||
use isahc::prelude::HttpClient;
|
||||
use isahc::ResponseExt;
|
||||
use isahc::{AsyncReadResponseExt, HttpClient};
|
||||
use serde_json::Value;
|
||||
use std::collections::{hash_map::DefaultHasher, HashMap, HashSet};
|
||||
use std::convert::TryFrom;
|
||||
|
@ -451,7 +450,7 @@ impl MailBackend for JmapType {
|
|||
)));
|
||||
}
|
||||
};
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
|
||||
let upload_response: UploadResponse = serde_json::from_str(&res_text)?;
|
||||
let mut req = Request::new(conn.request_no.clone());
|
||||
|
@ -475,7 +474,7 @@ impl MailBackend for JmapType {
|
|||
.client
|
||||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text)?;
|
||||
let m = ImportResponse::try_from(v.method_responses.remove(0)).or_else(|err| {
|
||||
|
@ -550,7 +549,7 @@ impl MailBackend for JmapType {
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
*store.online_status.lock().await = (std::time::Instant::now(), Ok(()));
|
||||
let m = QueryResponse::<EmailObject>::try_from(v.method_responses.remove(0))?;
|
||||
|
@ -645,7 +644,7 @@ impl MailBackend for JmapType {
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
*store.online_status.lock().await = (std::time::Instant::now(), Ok(()));
|
||||
|
@ -747,7 +746,7 @@ impl MailBackend for JmapType {
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
/*
|
||||
*{"methodResponses":[["Email/set",{"notUpdated":null,"notDestroyed":null,"oldState":"86","newState":"87","accountId":"u148940c7","updated":{"M045926eed54b11423918f392":{"id":"M045926eed54b11423918f392"}},"created":null,"destroyed":null,"notCreated":null},"m3"]],"sessionState":"cyrus-0;p-5;vfs-0"}
|
||||
*/
|
||||
|
|
|
@ -69,7 +69,7 @@ impl JmapConnection {
|
|||
jmap_session_resource_url.push_str("/.well-known/jmap");
|
||||
|
||||
let mut req = self.client.get_async(&jmap_session_resource_url).await?;
|
||||
let res_text = req.text_async().await?;
|
||||
let res_text = req.text().await?;
|
||||
|
||||
let session: JmapSession = match serde_json::from_str(&res_text) {
|
||||
Err(err) => {
|
||||
|
@ -177,7 +177,7 @@ impl JmapConnection {
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
debug!(&res_text);
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
let changes_response =
|
||||
|
|
|
@ -71,7 +71,7 @@ impl BackendOp for JmapOp {
|
|||
))
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
|
||||
store
|
||||
.byte_cache
|
||||
|
|
|
@ -101,7 +101,7 @@ pub async fn get_mailboxes(conn: &JmapConnection) -> Result<HashMap<MailboxHash,
|
|||
)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
*conn.store.online_status.lock().await = (std::time::Instant::now(), Ok(()));
|
||||
let m = GetResponse::<MailboxObject>::try_from(v.method_responses.remove(0))?;
|
||||
|
@ -191,7 +191,7 @@ pub async fn get_message_list(
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
*conn.store.online_status.lock().await = (std::time::Instant::now(), Ok(()));
|
||||
let m = QueryResponse::<EmailObject>::try_from(v.method_responses.remove(0))?;
|
||||
|
@ -214,7 +214,7 @@ pub async fn get_message(conn: &JmapConnection, ids: &[String]) -> Result<Vec<En
|
|||
.post_async(&conn.session.api_url, serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
let e = GetResponse::<EmailObject>::try_from(v.method_responses.remove(0))?;
|
||||
let GetResponse::<EmailObject> { list, .. } = e;
|
||||
|
@ -263,7 +263,7 @@ pub async fn fetch(
|
|||
.post_async(api_url.as_str(), serde_json::to_string(&req)?)
|
||||
.await?;
|
||||
|
||||
let res_text = res.text_async().await?;
|
||||
let res_text = res.text().await?;
|
||||
|
||||
let mut v: MethodResponse = serde_json::from_str(&res_text).unwrap();
|
||||
let e = GetResponse::<EmailObject>::try_from(v.method_responses.pop().unwrap())?;
|
||||
|
|
Loading…
Reference in New Issue