summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorDessalines <dessalines@users.noreply.github.com>2020-07-09 20:04:09 -0400
committerGitHub <noreply@github.com>2020-07-09 20:04:09 -0400
commit961d65c0ee304b97cc3932d7e2a7334a823e2969 (patch)
tree547161cf7ec7ba437d8f66cb67acac9721ee2440 /server
parent50e6d81d0b40e1d9caa0db83d20026adf3aef631 (diff)
Remove button for avatars. Fixes #755 (#924)
Diffstat (limited to 'server')
-rw-r--r--server/src/api/user.rs7
1 files changed, 6 insertions, 1 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<SaveUserSettings> {
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<SaveUserSettings> {
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()),