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

[lemmy.git] / crates / apub_lib / src / object_id.rs

diff --git a/crates/apub_lib/src/object_id.rs b/crates/apub_lib/src/object_id.rs
index 84c9c113a97832ffd3329751718bd128593a46bb..6a2d3d57c512eccdc564dc0f9d9e20c6869f1bc6 100644 (file)
--- a/crates/apub_lib/src/object_id.rs
+++ b/crates/apub_lib/src/object_id.rs
@@ -2,14 +2,13 @@ use crate::{traits::ApubObject, APUB_JSON_CONTENT_TYPE};
 use anyhow::anyhow;
 use chrono::{Duration as ChronoDuration, NaiveDateTime, Utc};
 use diesel::NotFound;
-use lemmy_utils::{request::retry, settings::structs::Settings, LemmyError};
+use lemmy_utils::{request::retry, settings::structs::Settings, LemmyError, REQWEST_TIMEOUT};
 use reqwest::StatusCode;
 use reqwest_middleware::ClientWithMiddleware;
 use serde::{Deserialize, Serialize};
 use std::{
   fmt::{Debug, Display, Formatter},
   marker::PhantomData,
-  time::Duration,
 };
 use tracing::info;
 use url::Url;
@@ -114,7 +113,7 @@ where
       client
         .get(self.0.as_str())
         .header("Accept", APUB_JSON_CONTENT_TYPE)
-        .timeout(Duration::from_secs(60))
+        .timeout(REQWEST_TIMEOUT)
         .send()
     })
     .await?;