From a3d6444035c40e845cd06d513c2f781fe05319a6 Mon Sep 17 00:00:00 2001
From: Dominic Mazzoni <dmazzoni@gmail.com>
Date: Wed, 28 Jun 2023 08:36:56 -0700
Subject: [PATCH] Return Result from captcha_as_wav_base64

---
 crates/api/src/lib.rs                    | 16 ++--------------
 crates/api/src/local_user/get_captcha.rs |  6 +++++-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
index 356331b506..778b13018d 100644
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
@@ -4,7 +4,6 @@ use lemmy_api_common::{context::LemmyContext, utils::local_site_to_slur_regex};
 use lemmy_db_schema::source::local_site::LocalSite;
 use lemmy_utils::{error::LemmyError, utils::slurs::check_slurs};
 use std::io::Cursor;
-use tracing::error;
 use wav;
 
 mod comment;
@@ -25,18 +24,7 @@ pub trait Perform {
 }
 
 /// Converts the captcha to a base64 encoded wav audio file
-pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> String {
-  match captcha_as_wav(captcha) {
-    Ok(wav_bytes) => base64::encode(wav_bytes),
-    Err(e) => {
-      error!("Error generating captcha: {}", e);
-      String::new()
-    }
-  }
-}
-
-/// Concatenate the wav files from each individual letter into a single wav audio file
-fn captcha_as_wav(captcha: &Captcha) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> Result<String, Box<dyn std::error::Error>> {
   let letters = captcha.as_wav();
 
   // Decode each wav file, concatenate the samples
@@ -55,7 +43,7 @@ fn captcha_as_wav(captcha: &Captcha) -> Result<Vec<u8>, Box<dyn std::error::Erro
                      &wav::BitDepth::Sixteen(concat_samples),
                      &mut output_buffer);
 
-  Ok(output_buffer.into_inner())
+  Ok(base64::encode(output_buffer.into_inner()))
 }
 
 /// Check size of report and remove whitespace
diff --git a/crates/api/src/local_user/get_captcha.rs b/crates/api/src/local_user/get_captcha.rs
index 1330442488..30ac18a6c0 100644
--- a/crates/api/src/local_user/get_captcha.rs
+++ b/crates/api/src/local_user/get_captcha.rs
@@ -10,6 +10,7 @@ use lemmy_db_schema::source::{
   local_site::LocalSite,
 };
 use lemmy_utils::error::LemmyError;
+use tracing::error;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetCaptcha {
@@ -33,7 +34,10 @@ impl Perform for GetCaptcha {
 
     let png = captcha.as_base64().expect("failed to generate captcha");
 
-    let wav = captcha_as_wav_base64(&captcha);
+    let wav = captcha_as_wav_base64(&captcha).unwrap_or_else(|err| {
+      error!("failed to generate audio captcha {}", err);
+      String::new()
+    });
 
     let captcha_form: CaptchaAnswerForm = CaptchaAnswerForm { answer };
     // Stores the captcha item in the db