Fix panic when running into posts which cannot be retrieved from the …

…API during GDPR run (#70)
andrewbanchich · Jun 25, 2023 · dd8d025 · dd8d025
1 parent 4d17f6a
commit dd8d025
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cli.rs b/src/cli.rs
@@ -79,6 +79,6 @@ impl Config {
         } else if self.dry_run {
             debug!("Skipping DELETION due to 'dry run' filter");
         }
-        return self.edit_only | self.dry_run;
+        self.edit_only | self.dry_run
     }
 }
diff --git a/src/things/comment.rs b/src/things/comment.rs
@@ -1,4 +1,4 @@
-use super::Shred;
+use super::{Shred, ShredditError};
 use crate::{
     cli::Config,
     sources::{api::Api, gdpr::Gdpr},
@@ -147,7 +147,10 @@ impl Shred for Comment {
                     }
                 }
                 Source::Gdpr { .. } => {
-                    let comment = self.to_api(client, access_token, config).await;
+                    let Ok(comment) = self.to_api(client, access_token, config).await else {
+			return
+		    };
+
                     match comment.source {
                         Source::Api { can_gild, .. } => {
                             if !can_gild {
@@ -213,7 +216,12 @@ impl Comment {
         false
     }
 
-    async fn to_api(&self, client: &Client, access_token: &str, config: &Config) -> Self {
+    async fn to_api(
+        &self,
+        client: &Client,
+        access_token: &str,
+        config: &Config,
+    ) -> Result<Self, ShredditError> {
         debug!("Getting comment from API...");
 
         let mut headers = HeaderMap::new();
@@ -240,10 +248,10 @@ impl Comment {
             .unwrap();
 
         match res {
-            Response::Success { data } => data.children.into_iter().next().unwrap().data,
+            Response::Success { data } => Ok(data.children.into_iter().next().unwrap().data),
             Response::Error(e) => {
-                error!("{e:#?}");
-                todo!();
+                error!("Couldn't get comment from API: {e:#?}");
+                Err(ShredditError::Unknown)
             }
         }
     }

diff --git a/src/things/mod.rs b/src/things/mod.rs
@@ -63,6 +63,7 @@ pub static LOREM_IPSUM: &str = "Lorem ipsum dolor sit amet, consectetur adipisci
 pub enum ShredditError {
     #[allow(dead_code)]
     RateLimited,
+    Unknown,
 }
 
 #[derive(Debug, Deserialize, PartialEq, Clone, ValueEnum)]