Merge branch 'main' into debug-federation

src/main.rs

@@ -31,7 +31,7 @@ use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
 use reqwest::Client;
 use reqwest_middleware::ClientBuilder;
 use reqwest_tracing::TracingMiddleware;
-use std::{env, sync::Arc, thread};
+use std::{env, sync::Arc, thread, time::Duration};
 use tokio::sync::Mutex;
 use tracing_actix_web::TracingLogger;
 
@@ -96,6 +96,7 @@ async fn main() -> Result<(), LemmyError> {
 
   let client = Client::builder()
     .user_agent(build_user_agent(&settings))
+    .timeout(Duration::from_secs(10))
     .build()?;
 
   let client = ClientBuilder::new(client).with(TracingMiddleware).build();