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

Move a field

Browse Source
This commit is contained in:
Pierre HUBERT 2021-04-16 15:13:35 +02:00
parent 2f931ff026
commit 53446ab8a6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api_data/general_settings_api.rs
View File

@ -19,9 +19,11 @@ pub struct GeneralSettingsAPI {
allow_posts_from_friends: bool, allow_posts_from_friends: bool,
allow_comunic_mails: bool, allow_comunic_mails: bool,
public_friends_list: bool, public_friends_list: bool,
public_email: bool,
virtual_directory: String, virtual_directory: String,
personnal_website: String, personnal_website: String,
publicNote: String, publicNote: String,
location: Option<String>,
} }
impl GeneralSettingsAPI { impl GeneralSettingsAPI {
@ -37,9 +39,11 @@ impl GeneralSettingsAPI {
allow_posts_from_friends: user.allow_posts_from_friends, allow_posts_from_friends: user.allow_posts_from_friends,
allow_comunic_mails: user.allow_mails, allow_comunic_mails: user.allow_mails,
public_friends_list: user.public_friends_list, public_friends_list: user.public_friends_list,
public_email: user.is_email_public,
virtual_directory: user.virtual_directory.clone().unwrap_or(String::new()), virtual_directory: user.virtual_directory.clone().unwrap_or(String::new()),
personnal_website: user.personal_website.clone().unwrap_or(String::new()), personnal_website: user.personal_website.clone().unwrap_or(String::new()),
publicNote: user.public_note.clone().unwrap_or(String::new()), publicNote: user.public_note.clone().unwrap_or(String::new()),
location: user.location.clone(),
} }
} }
} }

2
src/api_data/user_info.rs
View File

@ -31,7 +31,6 @@ pub struct APIAdvancedInfo {
personnalWebsite: String, personnalWebsite: String,
publicNote: String, publicNote: String,
location: Option<String>, location: Option<String>,
is_email_public: bool,
email_address: Option<String>, email_address: Option<String>,
noCommentOnHisPage: bool, noCommentOnHisPage: bool,
allowPostFromFriendOnHisPage: bool, allowPostFromFriendOnHisPage: bool,
@ -87,7 +86,6 @@ impl APIUserInfo {
personnalWebsite: info.personal_website.clone().unwrap_or(String::new()), personnalWebsite: info.personal_website.clone().unwrap_or(String::new()),
publicNote: info.public_note.clone().unwrap_or(String::new()), publicNote: info.public_note.clone().unwrap_or(String::new()),
location: info.location.clone(), location: info.location.clone(),
is_email_public: info.is_email_public,
email_address: match info.is_email_public { email_address: match info.is_email_public {
true => Some(info.email.clone()), true => Some(info.email.clone()),
false => None, false => None,