Merge pull request #1536 from LemmyNet/change_preferred_to_display_name

Changing preferred to display name. Fixes #1211

diff --combined crates/api/src/local_user.rs
index 8f69ab1b07f3135ee6cadeaed9f4daa94c7a38ed,2fb4056f21597c09316f2158ba79a090ce1ddf25..6a319dcd5741494ac1bf4ad5e036ed82a34003e7
--- 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;
@@@ -60,7 -60,7 +60,7 @@@ use lemmy_utils::
    email::send_email,
    location_info,
    settings::structs::Settings,
-   utils::{generate_random_string, is_valid_preferred_username, naive_from_unix},
+   utils::{generate_random_string, is_valid_display_name, naive_from_unix},
    ApiError,
    ConnectionId,
    LemmyError,
@@@ -135,11 -135,13 +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,
@@@ -172,7 -174,7 +172,7 @@@ impl Perform for SaveUserSettings 
      let banner = diesel_option_overwrite_to_url(&data.banner)?;
      let email = diesel_option_overwrite(&data.email);
      let bio = diesel_option_overwrite(&data.bio);
-     let preferred_username = diesel_option_overwrite(&data.preferred_username);
+     let display_name = diesel_option_overwrite(&data.display_name);
      let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id);
  
      if let Some(Some(bio)) = &bio {
@@@ -181,8 -183,8 +181,8 @@@
        }
      }
  
-     if let Some(Some(preferred_username)) = &preferred_username {
-       if !is_valid_preferred_username(preferred_username.trim()) {
+     if let Some(Some(display_name)) = &display_name {
+       if !is_valid_display_name(display_name.trim()) {
          return Err(ApiError::err("invalid_username").into());
        }
      }
@@@ -233,7 -235,7 +233,7 @@@
        avatar,
        banner,
        inbox_url: None,
-       preferred_username,
+       display_name,
        published: None,
        updated: Some(naive_now()),
        banned: None,
@@@ -265,7 -267,6 +265,7 @@@
        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 bcbfa7292778aebe3c50c8ec1824e8a955aaae56,d95fed6b5608ac6b50924012b59276056bc37f29..21fa1c778e5fe0393c6ef57368cd436e77ff055a
--- 1/crates/api_common/src/person.rs
--- 2/crates/api_common/src/person.rs
+++ b/crates/api_common/src/person.rs
@@@ -39,29 -39,28 +39,29 @@@ 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>,
    pub lang: Option<String>,
    pub avatar: Option<String>,
    pub banner: Option<String>,
-   pub preferred_username: Option<String>,
+   pub display_name: Option<String>,
    pub email: Option<String>,
    pub bio: Option<String>,
    pub matrix_user_id: Option<String>,
    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,
  }

diff --combined crates/db_schema/src/schema.rs
index a99908ad3ed8a98505af81b593f6562fb3c3a34a,04b5322c41da7e953ab5a73a92ed10bbe7933fc0..32fd3de1889d74cf066267c718f5a42ccdf39109
--- 1/crates/db_schema/src/schema.rs
--- 2/crates/db_schema/src/schema.rs
+++ b/crates/db_schema/src/schema.rs
@@@ -154,7 -154,6 +154,7 @@@ table! 
          show_avatars -> Bool,
          send_notifications_to_email -> Bool,
          validator_time -> Timestamp,
 +        show_scores -> Bool,
      }
  }
  
@@@ -271,7 -270,7 +271,7 @@@ table! 
      person (id) {
          id -> Int4,
          name -> Varchar,
-         preferred_username -> Nullable<Varchar>,
+         display_name -> Nullable<Varchar>,
          avatar -> Nullable<Varchar>,
          banned -> Bool,
          published -> Timestamp,
@@@ -471,7 -470,7 +471,7 @@@ table! 
      person_alias_1 (id) {
          id -> Int4,
          name -> Varchar,
-         preferred_username -> Nullable<Varchar>,
+         display_name -> Nullable<Varchar>,
          avatar -> Nullable<Varchar>,
          banned -> Bool,
          published -> Timestamp,
@@@ -495,7 -494,7 +495,7 @@@ table! 
      person_alias_2 (id) {
          id -> Int4,
          name -> Varchar,
-         preferred_username -> Nullable<Varchar>,
+         display_name -> Nullable<Varchar>,
          avatar -> Nullable<Varchar>,
          banned -> Bool,
          published -> Timestamp,