Skip to content

Commit 8df09d1

Browse files
ThaumyThaumy
committed
refactor: use reqwest query fn
1 parent 6b34b02 commit 8df09d1

File tree

6 files changed

+28
-38
lines changed

6 files changed

+28
-38
lines changed

‎src/api/fav/get_list.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::api::fav::Fav;
2-
use crate::infra::http::{body_or_err, RequestBuilderExt, VecExt as HttpVecExt};
2+
use crate::infra::http::{body_or_err, RequestBuilderExt};
33
use crate::infra::iter::IntoIteratorExt;
44
use crate::infra::json;
55
use crate::infra::result::IntoResult;
@@ -31,9 +31,9 @@ impl Fav {
3131
let cf = range
3232
.map(|i| async move {
3333
let req = {
34-
let query = vec![("pageIndex", i), ("pageSize", 1)].into_query_string();
35-
let url = openapi!("/Bookmarks?{}", query);
36-
client.get(url).pat_auth(&self.pat)
34+
let url = openapi!("/bookmarks");
35+
let query = [("pageIndex", i), ("pageSize", 1)];
36+
client.get(url).query(&query).pat_auth(&self.pat)
3737
};
3838

3939
let resp = req.send().await?;

‎src/api/ing/get_list.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl Ing {
5353
.map(|i| async move {
5454
let req = {
5555
let url = openapi!("/statuses/@{}", ing_type.clone() as usize);
56-
let query = vec![("pageIndex", i), ("pageSize", 1)];
56+
let query = [("pageIndex", i), ("pageSize", 1)];
5757
client.get(url).query(&query).pat_auth(&self.pat)
5858
};
5959

‎src/api/news/get_list.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::api::news::News;
2-
use crate::infra::http::{body_or_err, RequestBuilderExt, VecExt};
2+
use crate::infra::http::{body_or_err, RequestBuilderExt};
33
use crate::infra::iter::IntoIteratorExt;
44
use crate::infra::json;
55
use crate::infra::result::IntoResult;
@@ -37,11 +37,9 @@ impl News {
3737
range
3838
.map(|i| async move {
3939
let req = {
40-
let url = {
41-
let query = vec![("pageIndex", i), ("pageSize", 1)].into_query_string();
42-
openapi!("/newsitems/?{}", query)
43-
};
44-
client.get(url).pat_auth(&self.pat)
40+
let url = openapi!("/newsitems");
41+
let query = [("pageIndex", i), ("pageSize", 1)];
42+
client.get(url).query(&query).pat_auth(&self.pat)
4543
};
4644

4745
let resp = req.send().await?;

‎src/api/post/get_count.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::api::post::Post;
22
use crate::blog_backend;
3-
use crate::infra::http::{body_or_err, RequestBuilderExt, VecExt};
3+
use crate::infra::http::{body_or_err, RequestBuilderExt};
44
use crate::infra::json;
55
use crate::infra::result::IntoResult;
66
use anyhow::Result;
@@ -11,12 +11,9 @@ impl Post {
1111
let client = reqwest::Client::new();
1212

1313
let req = {
14-
let url = {
15-
let query = vec![('t', 1), ('p', 1), ('s', 1)].into_query_string();
16-
blog_backend!("/posts/list?{}", query)
17-
};
18-
19-
client.get(url).pat_auth(&self.pat)
14+
let url = blog_backend!("/posts/list");
15+
let query = [('t', 1), ('p', 1), ('s', 1)];
16+
client.get(url).query(&query).pat_auth(&self.pat)
2017
};
2118

2219
let resp = req.send().await?;

‎src/api/post/get_meta_list.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::api::post::get_one::PostEntry;
22
use crate::api::post::Post;
33
use crate::blog_backend;
4-
use crate::infra::http::{body_or_err, RequestBuilderExt, VecExt};
4+
use crate::infra::http::{body_or_err, RequestBuilderExt};
55
use crate::infra::iter::IntoIteratorExt;
66
use crate::infra::json;
77
use crate::infra::result::IntoResult;
@@ -35,12 +35,9 @@ impl Post {
3535
let vec = range
3636
.map(|i| async move {
3737
let req = {
38-
let url = {
39-
let query = vec![('t', 1), ('p', i), ('s', 1)].into_query_string();
40-
blog_backend!("/posts/list?{}", query)
41-
};
42-
43-
client.get(url).pat_auth(&self.pat)
38+
let url = blog_backend!("/posts/list");
39+
let query = [('t', 1), ('p', i), ('s', 1)];
40+
client.get(url).query(&query).pat_auth(&self.pat)
4441
};
4542

4643
let resp = req.send().await?;

‎src/api/post/search.rs‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::api::post::Post;
22
use crate::blog_backend;
3-
use crate::infra::http::{body_or_err, RequestBuilderExt, VecExt};
3+
use crate::infra::http::{body_or_err, RequestBuilderExt};
44
use crate::infra::iter::IntoIteratorExt;
55
use crate::infra::json;
66
use crate::infra::result::IntoResult;
@@ -22,15 +22,14 @@ impl Post {
2222
// If index is greater than the max page index, API will still return the last page
2323
let total_count = {
2424
let req = {
25-
let query = vec![
26-
("t", "1".to_string()),
25+
let url = blog_backend!("/posts/list");
26+
let query = [
27+
("t", 1.to_string()),
2728
("p", 1.to_string()),
2829
("s", 1.to_string()),
2930
("search", keyword.to_string()),
30-
]
31-
.into_query_string();
32-
let url = blog_backend!("/posts/list?{}", query);
33-
client.get(url).pat_auth(&self.pat)
31+
];
32+
client.get(url).query(&query).pat_auth(&self.pat)
3433
};
3534
let resp = req.send().await?;
3635

@@ -48,15 +47,14 @@ impl Post {
4847
let id_list = range
4948
.map(|i| async move {
5049
let req = {
51-
let query = vec![
52-
("t", "1".to_string()),
50+
let url = blog_backend!("/posts/list");
51+
let query = [
52+
("t", 1.to_string()),
5353
("p", i.to_string()),
5454
("s", 1.to_string()),
5555
("search", keyword.to_string()),
56-
]
57-
.into_query_string();
58-
let url = blog_backend!("/posts/list?{}", query);
59-
client.get(url).pat_auth(&self.pat)
56+
];
57+
client.get(url).query(&query).pat_auth(&self.pat)
6058
};
6159
let resp = req.send().await?;
6260

0 commit comments

Comments
 (0)