Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ clap = { version = "4", features = ["derive"] }
chrono = "0.4"
image = { version = "0.25", default-features = false, features = ["jpeg", "png"] }
reqwest = { version = "0.12", default-features = false }
reqwest-middleware = "0.4.2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
uuid = { version = "1", features = ["v4"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ pub async fn import_rss(api: &Api, source: &str, slug: Option<&str>) -> Result<(

pub async fn delete_events(
api: &Api,
request: reqwest::RequestBuilder,
request: reqwest_middleware::RequestBuilder,
kind: &str,
identity_key: &str,
identity: &str,
Expand Down
1 change: 1 addition & 0 deletions crates/sync-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ futures-util = "0.3"
hex = "0.4"
image = { version = "0.25", default-features = false, features = ["jpeg", "png"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls-native-roots"] }
reqwest-middleware = { version = "0.4.2", features = ["json"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_yaml = "0.9"
Expand Down
7 changes: 4 additions & 3 deletions crates/sync-engine/src/api.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::{auth::StoredAuth, config::Config};
use anyhow::{Context, Result, bail, ensure};
use reqwest::{Client, RequestBuilder, Response};
use reqwest::{Client, Response};
use reqwest_middleware::{ClientWithMiddleware, RequestBuilder};
use serde::de::DeserializeOwned;
use serde_json::Value;
use std::{future::Future, time::Duration};
Expand All @@ -19,7 +20,7 @@ impl std::error::Error for AuthenticationRequired {}
pub struct Api {
pub config: Config,
pub credential: Option<String>,
pub http: Client,
pub http: ClientWithMiddleware,
pub cancel: CancellationToken,
}

Expand All @@ -42,7 +43,7 @@ impl Api {
Ok(Self {
config,
credential,
http: builder.build()?,
http: reqwest_middleware::ClientBuilder::new(builder.build()?).build(),
cancel,
})
}
Expand Down
3 changes: 2 additions & 1 deletion crates/sync-engine/src/events.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::api::Api;
use anyhow::{Result, bail, ensure};
use reqwest::{RequestBuilder, Response};
use reqwest::Response;
use reqwest_middleware::RequestBuilder;
use serde_json::Value;

pub struct Events {
Expand Down
95 changes: 48 additions & 47 deletions crates/sync-engine/src/publicapi/mod.rs

Large diffs are not rendered by default.