From: Dessalines <tyhou13@gmx.com> Date: Tue, 6 Apr 2021 16:09:26 +0000 (-0400) Subject: Merge branch 'main' into change_password_api X-Git-Url: http://these/git/%22https:/image.com/%24%7Bargs.pageFn.prev%7D?a=commitdiff_plain;h=d97129e7ae095ae39de2ce321eaaac2bfe1bdcb6;p=lemmy.git Merge branch 'main' into change_password_api --- d97129e7ae095ae39de2ce321eaaac2bfe1bdcb6 diff --cc crates/api_common/src/person.rs index 53033a92,21fa1c77..6402096c --- a/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_scores: Option<bool>, - pub show_avatars: 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, }