From abe3ab2809780496bfe137b5f8bd604a97eb16e6 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 6 Nov 2023 13:03:59 +0100 Subject: [PATCH] machete --- Cargo.lock | 1 - Cargo.toml | 1 - crates/api_common/src/request.rs | 2 +- crates/db_schema/Cargo.toml | 2 +- crates/utils/Cargo.toml | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26f232a1a..d2285672e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2856,7 +2856,6 @@ dependencies = [ "tracing", "tracing-error", "ts-rs", - "typed-builder", "url", "urlencoding", "uuid", diff --git a/Cargo.toml b/Cargo.toml index d9e336a4c..f9792feaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,7 +107,6 @@ anyhow = { version = "1.0.75", features = [ "backtrace", ] } # backtrace is on by default on nightly, but not stable rust diesel_ltree = "0.3.0" -typed-builder = "0.15.2" serial_test = "2.0.0" tokio = { version = "1.33.0", features = ["full"] } regex = "1.10.2" diff --git a/crates/api_common/src/request.rs b/crates/api_common/src/request.rs index aeb92b7d8..f6dcc61dd 100644 --- a/crates/api_common/src/request.rs +++ b/crates/api_common/src/request.rs @@ -233,7 +233,7 @@ async fn generate_pictrs_thumbnail( ) -> Result { let pictrs_config = context.settings().pictrs_config()?; - if pictrs_config.disable_external_link_previews { + if pictrs_config.cache_external_link_previews { return Ok(proxy_image_link(image_url.clone(), context).await?.into()); } diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index bf1fc0ef2..a422f098c 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -62,7 +62,6 @@ diesel-async = { workspace = true, features = [ regex = { workspace = true, optional = true } once_cell = { workspace = true, optional = true } diesel_ltree = { workspace = true, optional = true } -typed-builder = { workspace = true } async-trait = { workspace = true } tracing = { workspace = true } deadpool = { version = "0.9.5", features = ["rt_tokio_1"], optional = true } @@ -73,6 +72,7 @@ tokio-postgres = { workspace = true, optional = true } tokio-postgres-rustls = { workspace = true, optional = true } rustls = { workspace = true, optional = true } uuid = { workspace = true, features = ["v4"] } +typed-builder = "0.15.2" [dev-dependencies] serial_test = { workspace = true } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 148fc766f..7f8de3b35 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -36,7 +36,6 @@ http = { workspace = true } doku = { workspace = true, features = ["url-2"] } uuid = { workspace = true, features = ["serde", "v4"] } rosetta-i18n = { workspace = true } -typed-builder = { workspace = true } tokio = { workspace = true } urlencoding = { workspace = true } openssl = "0.10.57"