(Fix) Added error handling to client (reqwest) building

xairaven · Jan 15, 2025 · d0b1c44 · d0b1c44
1 parent 97cec8c
commit d0b1c44
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -3,6 +3,7 @@
   "Start": "<b>Welcome to the Media Downloader Bot!</b>\n\n<b>Commands:</b>\n- /help: Display this help message.\n\n<b>How to use:</b>\nTo download media from TikTok or Instagram, simply send a link directly to the bot.\nThe bot will process the link and send the media file back to you.\n\n<b>Additional Notes:</b>\nEnsure that content is directly accessible (not private or restricted).\n\n<b>Supported formats:</b>\n- TikTok Videos;\n- TikTok Photo Slides;\n- Instagram Reels;\n- Instagram Stories;\n- Instagram Photos;\n- Instagram Slides.",
   "Help": "<b>Commands:</b>\n- /help: Display this help message.\n\n<b>How to use:</b>\nTo download media from TikTok or Instagram, simply send a link directly to the bot.\nThe bot will process the link and send the media file back to you.\n\n<b>Additional Notes:</b>\nEnsure that content is directly accessible (not private or restricted).\n\n<b>Supported formats:</b>\n- TikTok Videos;\n- TikTok Photo Slides;\n- Instagram Reels;\n- Instagram Stories;\n- Instagram Photos;\n- Instagram Slides.",
 
+  "ClientBuildingFailed": "Failed to build Client (reqwest).",
   "FailedGetResponse": "Failed to get a response from API.",
   "FailedParseResponse": "Failed to parse response.",
   "FailedParseUrl": "Failed to parse final url.",

diff --git a/src/api.rs b/src/api.rs
@@ -163,6 +163,9 @@ impl Response {
 
 #[derive(Debug, Error)]
 pub enum ApiError {
+    #[error("ClientBuildingFailed")]
+    ClientBuildingFailed,
+
     #[error("FailedGetResponse")]
     FailedGetResponse,
 

diff --git a/src/api/instagram/core.rs b/src/api/instagram/core.rs
@@ -59,7 +59,7 @@ async fn request(
     let client = reqwest::Client::builder()
         .redirect(reqwest::redirect::Policy::none())
         .build()
-        .unwrap();
+        .map_err(|_| ApiError::ClientBuildingFailed)?;
 
     let request_body = match content_type {
         ContentType::Photos | ContentType::Reels => format!(

diff --git a/src/api/tiktok/core.rs b/src/api/tiktok/core.rs
@@ -37,7 +37,7 @@ async fn request(api_key: &str, link: &str) -> Result<String, ApiError> {
     let client = reqwest::Client::builder()
         .redirect(reqwest::redirect::Policy::none())
         .build()
-        .unwrap();
+        .map_err(|_| ApiError::ClientBuildingFailed)?;
 
     let request_body = format!(
         "https://tiktok-download-without-watermark.p.rapidapi.com/analysis?url={}&hd=0",