diff options
author | Dessalines <tyhou13@gmx.com> | 2019-12-29 15:39:48 -0500 |
---|---|---|
committer | Dessalines <tyhou13@gmx.com> | 2019-12-29 15:39:48 -0500 |
commit | a4428528e30b18eb85596edf9c26bc8b6b7d11ee (patch) | |
tree | 450f5662ada20a7f66f809033d57fbc12dcc963d /server/src/api/user.rs | |
parent | 106aaf4f28ef34d68848f48e5673f955a04b6deb (diff) |
Adding user avatars / icons. Requires pictshare.
- Fixes #188
Diffstat (limited to 'server/src/api/user.rs')
-rw-r--r-- | server/src/api/user.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/server/src/api/user.rs b/server/src/api/user.rs index a04ba4b2..e8ad20aa 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -27,6 +27,7 @@ pub struct SaveUserSettings { default_sort_type: i16, default_listing_type: i16, lang: String, + avatar: Option<String>, auth: String, } @@ -220,6 +221,7 @@ impl Perform<LoginResponse> for Oper<Register> { name: data.username.to_owned(), fedi_name: Settings::get().hostname.to_owned(), email: data.email.to_owned(), + avatar: None, password_encrypted: data.password.to_owned(), preferred_username: None, updated: None, @@ -314,6 +316,7 @@ impl Perform<LoginResponse> for Oper<SaveUserSettings> { name: read_user.name, fedi_name: read_user.fedi_name, email: read_user.email, + avatar: data.avatar.to_owned(), password_encrypted: read_user.password_encrypted, preferred_username: read_user.preferred_username, updated: Some(naive_now()), @@ -372,7 +375,12 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> { data.username.to_owned().unwrap_or("admin".to_string()), ) { Ok(user) => user.id, - Err(_e) => return Err(APIError::err(&self.op, "couldnt_find_that_username_or_email"))? + Err(_e) => { + return Err(APIError::err( + &self.op, + "couldnt_find_that_username_or_email", + ))? + } } } }; @@ -449,6 +457,7 @@ impl Perform<AddAdminResponse> for Oper<AddAdmin> { name: read_user.name, fedi_name: read_user.fedi_name, email: read_user.email, + avatar: read_user.avatar, password_encrypted: read_user.password_encrypted, preferred_username: read_user.preferred_username, updated: Some(naive_now()), @@ -511,6 +520,7 @@ impl Perform<BanUserResponse> for Oper<BanUser> { name: read_user.name, fedi_name: read_user.fedi_name, email: read_user.email, + avatar: read_user.avatar, password_encrypted: read_user.password_encrypted, preferred_username: read_user.preferred_username, updated: Some(naive_now()), @@ -848,6 +858,7 @@ impl Perform<LoginResponse> for Oper<PasswordChange> { name: read_user.name, fedi_name: read_user.fedi_name, email: read_user.email, + avatar: read_user.avatar, password_encrypted: data.password.to_owned(), preferred_username: read_user.preferred_username, updated: Some(naive_now()), |