Consolidate and lower reqwest timeouts. Fixes #2150 (#2151)

[lemmy.git] / crates / utils / src / request.rs

diff --git a/crates/utils/src/request.rs b/crates/utils/src/request.rs
index 4f87c10aea3b0e4f0f8d55d277a63e3729917e74..1e4f4bf3c2a3d2e4dec9545c2d3172f55a52d53e 100644 (file)
--- a/crates/utils/src/request.rs
+++ b/crates/utils/src/request.rs
@@ -1,10 +1,10 @@
-use crate::{settings::structs::Settings, version::VERSION, LemmyError};
+use crate::{settings::structs::Settings, version::VERSION, LemmyError, REQWEST_TIMEOUT};
 use anyhow::anyhow;
 use encoding::{all::encodings, DecoderTrap};
 use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
 use reqwest_middleware::ClientWithMiddleware;
 use serde::{Deserialize, Serialize};
-use std::{future::Future, time::Duration};
+use std::future::Future;
 use thiserror::Error;
 use tracing::{error, info};
 use url::Url;
@@ -71,7 +71,7 @@ pub async fn fetch_site_metadata(
   info!("Fetching site metadata for url: {}", url);
   let response = client
     .get(url.as_str())
-    .timeout(Duration::from_secs(30))
+    .timeout(REQWEST_TIMEOUT)
     .send()
     .await?;
 
@@ -183,7 +183,7 @@ pub(crate) async fn fetch_pictrs(
 
     let response = client
       .get(&fetch_url)
-      .timeout(Duration::from_secs(30))
+      .timeout(REQWEST_TIMEOUT)
       .send()
       .await?;
 
@@ -259,7 +259,7 @@ pub async fn fetch_site_data(
 async fn is_image_content_type(client: &ClientWithMiddleware, url: &Url) -> Result<(), LemmyError> {
   let response = client
     .get(url.as_str())
-    .timeout(Duration::from_secs(30))
+    .timeout(REQWEST_TIMEOUT)
     .send()
     .await?;
   if response