OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 22:46:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify src/core/network/mod.rs

Browse source
This commit is contained in:
Temirkhan Myrzamadi 2019-09-20 06:24:08 +06:00
parent cc9d59cf49
commit cb5ea4a5b7
1 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/core/network/mod.rs
View file

@ -5,7 +5,7 @@ use crate::core::{
use apply::Apply; use apply::Apply;
use reqwest::{ use reqwest::{
r#async::{multipart::Form, Client}, r#async::{multipart::Form, Client, Response},
StatusCode, StatusCode,
}; };
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
@ -42,33 +42,18 @@ pub async fn request_multipart<T: DeserializeOwned>(
method_name: &str, method_name: &str,
params: Option<Form>, params: Option<Form>,
) -> ResponseResult<T> { ) -> ResponseResult<T> {
let mut response = client process_response(
.post(&method_url(TELEGRAM_API_URL, token, method_name)) client
.apply(|request_builder| match params { .post(&method_url(TELEGRAM_API_URL, token, method_name))
Some(params) => request_builder.multipart(params), .apply(|request_builder| match params {
None => request_builder, Some(params) => request_builder.multipart(params),
}) None => request_builder,
.send() })
.await .send()
.map_err(RequestError::NetworkError)?; .await
.map_err(RequestError::NetworkError)?,
let response = serde_json::from_str::<TelegramResponse<T>>(
&response.text().await.map_err(RequestError::NetworkError)?,
) )
.map_err(RequestError::InvalidJson)?; .await
match response {
TelegramResponse::Ok { result, .. } => Ok(result),
TelegramResponse::Err {
description,
error_code,
response_parameters: _,
..
} => Err(RequestError::ApiError {
description,
status_code: StatusCode::from_u16(error_code).unwrap(),
}),
}
} }
pub async fn request_json<T: DeserializeOwned, P: Serialize>( pub async fn request_json<T: DeserializeOwned, P: Serialize>(
@ -77,13 +62,20 @@ pub async fn request_json<T: DeserializeOwned, P: Serialize>(
method_name: &str, method_name: &str,
params: &P, params: &P,
) -> ResponseResult<T> { ) -> ResponseResult<T> {
let mut response = client process_response(
.post(&method_url(TELEGRAM_API_URL, token, method_name)) client
.json(params) .post(&method_url(TELEGRAM_API_URL, token, method_name))
.send() .json(params)
.await .send()
.map_err(RequestError::NetworkError)?; .await
.map_err(RequestError::NetworkError)?,
)
.await
}
async fn process_response<T: DeserializeOwned>(
mut response: Response,
) -> ResponseResult<T> {
let response = serde_json::from_str::<TelegramResponse<T>>( let response = serde_json::from_str::<TelegramResponse<T>>(
&response.text().await.map_err(RequestError::NetworkError)?, &response.text().await.map_err(RequestError::NetworkError)?,
) )
@ -107,14 +99,14 @@ pub async fn request_json<T: DeserializeOwned, P: Serialize>(
#[serde(untagged)] #[serde(untagged)]
enum TelegramResponse<R> { enum TelegramResponse<R> {
Ok { Ok {
/// Dummy field. Used for deserialization. /// A dummy field. Used only for deserialization.
#[allow(dead_code)] #[allow(dead_code)]
ok: bool, // TODO: True type ok: bool, // TODO: True type
result: R, result: R,
}, },
Err { Err {
/// Dummy field. Used for deserialization. /// A dummy field. Used only for deserialization.
#[allow(dead_code)] #[allow(dead_code)]
ok: bool, // TODO: False type ok: bool, // TODO: False type