From 961d65c0ee304b97cc3932d7e2a7334a823e2969 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 9 Jul 2020 20:04:09 -0400 Subject: [PATCH] Remove button for avatars. Fixes #755 (#924) --- server/src/api/user.rs | 7 ++++++- ui/src/components/user.tsx | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/server/src/api/user.rs b/server/src/api/user.rs index 9b72a919..1284c660 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -451,6 +451,11 @@ impl Perform for Oper { None => read_user.email, }; + let avatar = match &data.avatar { + Some(avatar) => Some(avatar.to_owned()), + None => read_user.avatar, + }; + let password_encrypted = match &data.new_password { Some(new_password) => { match &data.new_password_verify { @@ -488,7 +493,7 @@ impl Perform for Oper { name: read_user.name, email, matrix_user_id: data.matrix_user_id.to_owned(), - avatar: data.avatar.to_owned(), + avatar, password_encrypted, preferred_username: read_user.preferred_username, updated: Some(naive_now()), diff --git a/ui/src/components/user.tsx b/ui/src/components/user.tsx index af72a397..0e107363 100644 --- a/ui/src/components/user.tsx +++ b/ui/src/components/user.tsx @@ -535,7 +535,7 @@ export class User extends Component { htmlFor="file-upload" class="pointer ml-4 text-muted small font-weight-bold" > - {!this.state.userSettingsForm.avatar ? ( + {!this.checkSettingsAvatar ? ( {i18n.t('upload_avatar')} @@ -559,6 +559,18 @@ export class User extends Component { /> + {this.checkSettingsAvatar && ( +
+ +
+ )}