From 53446ab8a66a3cda0a0da664691411d33ec10edf Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Fri, 16 Apr 2021 15:13:35 +0200
Subject: [PATCH] Move a field

---
 src/api_data/general_settings_api.rs | 4 ++++
 src/api_data/user_info.rs            | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api_data/general_settings_api.rs b/src/api_data/general_settings_api.rs
index 65badeb..d54d60c 100644
--- a/src/api_data/general_settings_api.rs
+++ b/src/api_data/general_settings_api.rs
@@ -19,9 +19,11 @@ pub struct GeneralSettingsAPI {
     allow_posts_from_friends: bool,
     allow_comunic_mails: bool,
     public_friends_list: bool,
+    public_email: bool,
     virtual_directory: String,
     personnal_website: String,
     publicNote: String,
+    location: Option<String>,
 }
 
 impl GeneralSettingsAPI {
@@ -37,9 +39,11 @@ impl GeneralSettingsAPI {
             allow_posts_from_friends: user.allow_posts_from_friends,
             allow_comunic_mails: user.allow_mails,
             public_friends_list: user.public_friends_list,
+            public_email: user.is_email_public,
             virtual_directory: user.virtual_directory.clone().unwrap_or(String::new()),
             personnal_website: user.personal_website.clone().unwrap_or(String::new()),
             publicNote: user.public_note.clone().unwrap_or(String::new()),
+            location: user.location.clone(),
         }
     }
 }
\ No newline at end of file
diff --git a/src/api_data/user_info.rs b/src/api_data/user_info.rs
index c12abd3..f8bd964 100644
--- a/src/api_data/user_info.rs
+++ b/src/api_data/user_info.rs
@@ -31,7 +31,6 @@ pub struct APIAdvancedInfo {
     personnalWebsite: String,
     publicNote: String,
     location: Option<String>,
-    is_email_public: bool,
     email_address: Option<String>,
     noCommentOnHisPage: bool,
     allowPostFromFriendOnHisPage: bool,
@@ -87,7 +86,6 @@ impl APIUserInfo {
             personnalWebsite: info.personal_website.clone().unwrap_or(String::new()),
             publicNote: info.public_note.clone().unwrap_or(String::new()),
             location: info.location.clone(),
-            is_email_public: info.is_email_public,
             email_address: match info.is_email_public {
                 true => Some(info.email.clone()),
                 false => None,