From 135d2c6b02f09f98b4f6c5ca64b07aae7a0d809a Mon Sep 17 00:00:00 2001
From: Vecna <vvecna@uwaterloo.ca>
Date: Sun, 7 Jul 2024 11:30:39 -0400
Subject: [PATCH] Handle errors sending positive reports

---
 src/censor.rs | 22 +++++++++++-----------
 src/user.rs   | 23 +++++++++++------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/censor.rs b/src/censor.rs
index a6c64aa..95b5843 100644
--- a/src/censor.rs
+++ b/src/censor.rs
@@ -126,22 +126,22 @@ impl Censor {
         }
 
         let (cred, _) = &self.lox_credentials.get(fingerprint).unwrap();
-        let pr = PositiveReport::from_lox_credential(
+        if let Ok(pr) = PositiveReport::from_lox_credential(
             *fingerprint,
             None,
             cred,
             get_lox_pub(&config.la_pubkeys),
             config.country.clone(),
-        )
-        .unwrap();
-        if config
-            .tp_net
-            .request("/positivereport".to_string(), pr.to_json().into_bytes())
-            .await
-            .is_err()
-        {
-            // failed to send positive report
-            return false;
+        ) {
+            if config
+                .tp_net
+                .request("/positivereport".to_string(), pr.to_json().into_bytes())
+                .await
+                .is_err()
+            {
+                // failed to send positive report
+                return false;
+            }
         }
         true
     }
diff --git a/src/user.rs b/src/user.rs
index 85acc30..667973a 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -589,16 +589,15 @@ impl User {
                             bridge.first_positive_report = get_date();
                         }
 
-                        positive_reports.push(
-                            PositiveReport::from_lox_credential(
-                                fingerprint,
-                                None,
-                                &self.primary_cred,
-                                get_lox_pub(&config.la_pubkeys),
-                                config.country.to_string(),
-                            )
-                            .unwrap(),
-                        );
+                        if let Ok(pr) = PositiveReport::from_lox_credential(
+                            fingerprint,
+                            None,
+                            &self.primary_cred,
+                            get_lox_pub(&config.la_pubkeys),
+                            config.country.to_string(),
+                        ) {
+                            positive_reports.push(pr)
+                        }
                     }
                 }
             }
@@ -628,7 +627,7 @@ impl User {
                     level_up(
                         &config.la_net,
                         &self.primary_cred,
-                        &reachcred.unwrap(),
+                        &reachcred.unwrap(), // must be Some
                         get_lox_pub(&config.la_pubkeys),
                         get_reachability_pub(&config.la_pubkeys),
                     )
@@ -806,7 +805,7 @@ impl User {
                 level_up(
                     &config.la_net,
                     &self.primary_cred,
-                    &reachcred.unwrap(),
+                    &reachcred.unwrap(), // must be Some
                     get_lox_pub(&config.la_pubkeys),
                     get_reachability_pub(&config.la_pubkeys),
                 )