Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2024-11-26 07:19:22 +00:00
Code Issues Projects Releases Wiki Activity

Account image URL is null if unset

Browse Source
This commit is contained in:
Pierre HUBERT 2021-07-12 18:43:17 +02:00
parent e5b64746b4
commit c14a0da518
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api_data/admin/admin_search_user_result_api.rs
View File

@ -10,7 +10,7 @@ pub struct AdminSearchUserResult {
first_name: String, first_name: String,
last_name: String, last_name: String,
email: String, email: String,
account_image: String account_image: Option<String>
} }
impl AdminSearchUserResult { impl AdminSearchUserResult {

2
src/api_data/admin/admin_user_info_api.rs
View File

@ -16,7 +16,7 @@ pub struct AdminUserInfoAPI {
last_activity: u64, last_activity: u64,
page_visibility: &'static str, page_visibility: &'static str,
directory: Option<String>, directory: Option<String>,
account_image: String, account_image: Option<String>,
account_image_visibility: String, account_image_visibility: String,
friend_list_public: bool, friend_list_public: bool,
is_email_public: bool, is_email_public: bool,

8
src/data/user.rs
View File

@ -182,11 +182,11 @@ impl User {
/// Get the URL pointing to a user account image for an administrator. An administrator can /// Get the URL pointing to a user account image for an administrator. An administrator can
/// only access to the user account image if it is visible to all Comunic users /// only access to the user account image if it is visible to all Comunic users
pub fn account_image_url_for_admin(&self) -> String { pub fn account_image_url_for_admin(&self) -> Option<String> {
match (&self.account_image_visibility, &self.account_image_path) { match (&self.account_image_visibility, &self.account_image_path) {
(AccountImageVisibility::FRIENDS, _) => User::error_account_image_url(), (_, None) => None,
(_, None) => User::default_account_image_url(), (AccountImageVisibility::FRIENDS, _) => Some(User::error_account_image_url()),
(_, Some(path)) => user_data_url(path), (_, Some(path)) => Some(user_data_url(path)),
} }
} }