Merge branch 'main' into change_password_api

diff --cc crates/api/src/lib.rs
Simple merge

diff --cc crates/api/src/local_user.rs
Simple merge

diff --cc crates/api_common/src/person.rs
index 53033a9205083b73ab285f0b4d5d79ae89436adb,21fa1c778e5fe0393c6ef57368cd436e77ff055a..6402096c9a0b94d16893fd69f167ef13f9914b2c
--- 1/crates/api_common/src/person.rs
--- 2/crates/api_common/src/person.rs
+++ b/crates/api_common/src/person.rs
@@@ -47,6 -47,8 +47,7 @@@ pub struct CaptchaResponse 
  #[derive(Deserialize)]
  pub struct SaveUserSettings {
    pub show_nsfw: Option<bool>,
 -  pub show_avatars: Option<bool>,
+   pub show_scores: Option<bool>,
    pub theme: Option<String>,
    pub default_sort_type: Option<i16>,
    pub default_listing_type: Option<i16>,
@@@ -57,7 -59,9 +58,10 @@@
    pub email: Option<String>,
    pub bio: Option<String>,
    pub matrix_user_id: Option<String>,
 +  pub show_avatars: Option<bool>,
+   pub new_password: Option<String>,
+   pub new_password_verify: Option<String>,
+   pub old_password: Option<String>,
    pub send_notifications_to_email: Option<bool>,
    pub auth: String,
  }