Merge pull request #1535 from LemmyNet/rust_captcha_features

Rust captcha features

diff --combined crates/api/src/local_user.rs
index c28d8c725c730e1e95f71e4171aef2f7e379c759,831e38a17de8af0b56056f5ddaeb63c919262153..8f69ab1b07f3135ee6cadeaed9f4daa94c7a38ed
--- 1/crates/api/src/local_user.rs
--- 2/crates/api/src/local_user.rs
+++ b/crates/api/src/local_user.rs
@@@ -1,4 -1,4 +1,4 @@@
- use crate::{captcha_espeak_wav_base64, Perform};
+ use crate::{captcha_as_wav_base64, Perform};
  use actix_web::web::Data;
  use anyhow::Context;
  use bcrypt::verify;
@@@ -135,13 -135,11 +135,11 @@@ impl Perform for GetCaptcha 
  
      let answer = captcha.chars_as_string();
  
-     let png_byte_array = captcha.as_png().expect("failed to generate captcha");
- 
-     let png = base64::encode(png_byte_array);
+     let png = captcha.as_base64().expect("failed to generate captcha");
  
      let uuid = uuid::Uuid::new_v4().to_string();
  
-     let wav = captcha_espeak_wav_base64(&answer).ok();
+     let wav = captcha_as_wav_base64(&captcha);
  
      let captcha_item = CaptchaItem {
        answer,
@@@ -267,7 -265,6 +265,7 @@@ impl Perform for SaveUserSettings 
        email,
        password_encrypted,
        show_nsfw: data.show_nsfw,
 +      show_scores: data.show_scores,
        theme: data.theme.to_owned(),
        default_sort_type,
        default_listing_type,

diff --combined crates/api_common/src/person.rs
index c4f8adbf931c463c9184127648f0598bb8ce5337,7b732412c8275bedff68f396ca411628ae3fa4cf..bcbfa7292778aebe3c50c8ec1824e8a955aaae56
--- 1/crates/api_common/src/person.rs
--- 2/crates/api_common/src/person.rs
+++ b/crates/api_common/src/person.rs
@@@ -39,16 -39,14 +39,16 @@@ pub struct GetCaptchaResponse 
  
  #[derive(Serialize)]
  pub struct CaptchaResponse {
-   pub png: String,         // A Base64 encoded png
-   pub wav: Option<String>, // A Base64 encoded wav audio
+   pub png: String, // A Base64 encoded png
+   pub wav: String, // A Base64 encoded wav audio
    pub uuid: String,
  }
  
  #[derive(Deserialize)]
  pub struct SaveUserSettings {
    pub show_nsfw: Option<bool>,
 +  pub show_scores: Option<bool>,
 +  pub show_avatars: Option<bool>,
    pub theme: Option<String>,
    pub default_sort_type: Option<i16>,
    pub default_listing_type: Option<i16>,
@@@ -62,6 -60,7 +62,6 @@@
    pub new_password: Option<String>,
    pub new_password_verify: Option<String>,
    pub old_password: Option<String>,
 -  pub show_avatars: Option<bool>,
    pub send_notifications_to_email: Option<bool>,
    pub auth: String,
  }