Changing default_sort and listing back to numbers.

diff --git a/lemmy_api/src/user.rs b/lemmy_api/src/user.rs
index 91c3b11adb4171c0f3b8ef4dcf6e5b17bd02dcc9..ceafad8a3e26738c1b127f0acffee327cc633455 100644 (file)
--- a/lemmy_api/src/user.rs
+++ b/lemmy_api/src/user.rs
@@ -414,8 +414,8 @@ impl Perform for SaveUserSettings {
       None => user.password_encrypted,
     };
 
-    let default_listing_type = ListingType::from_str(&data.default_listing_type)? as i16;
-    let default_sort_type = SortType::from_str(&data.default_sort_type)? as i16;
+    let default_listing_type = data.default_listing_type;
+    let default_sort_type = data.default_sort_type;
 
     let user_form = UserForm {
       name: user.name,
@@ -509,7 +509,7 @@ impl Perform for GetUserDetails {
 
     let user_id = user.map(|u| u.id);
 
-    let (user_view, user_dangerous) = if let Some(auth_user_id) = user_id {
+    let (user_view, user_view_dangerous) = if let Some(auth_user_id) = user_id {
       if user_details_id == auth_user_id {
         (
           None,
@@ -591,7 +591,7 @@ impl Perform for GetUserDetails {
     // Return the jwt
     Ok(GetUserDetailsResponse {
       user_view,
-      user_view_dangerous: user_dangerous,
+      user_view_dangerous,
       follows,
       moderates,
       comments,

diff --git a/lemmy_db_views/Cargo.toml b/lemmy_db_views/Cargo.toml
index 1353ddf3a610742cc5bbebeab35f829bba04859b..8991b241fe3aa1603da4a45f21ebef48e1587702 100644 (file)
--- a/lemmy_db_views/Cargo.toml
+++ b/lemmy_db_views/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2018"
 lemmy_db_queries = { path = "../lemmy_db_queries" }
 lemmy_db_schema = { path = "../lemmy_db_schema" }
 diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
-serde = { version = "1.0.118", features = ["derive"] }
\ No newline at end of file
+serde = { version = "1.0.118", features = ["derive"] }

diff --git a/lemmy_structs/src/user.rs b/lemmy_structs/src/user.rs
index a3836f11fcdb7d140a24733a2f6488cf7a901efa..5964bf6000f532db2ae72c0a8118c3389295165b 100644 (file)
--- a/lemmy_structs/src/user.rs
+++ b/lemmy_structs/src/user.rs
@@ -48,8 +48,8 @@ pub struct CaptchaResponse {
 pub struct SaveUserSettings {
   pub show_nsfw: bool,
   pub theme: String,
-  pub default_sort_type: String,
-  pub default_listing_type: String,
+  pub default_sort_type: i16,
+  pub default_listing_type: i16,
   pub lang: String,
   pub avatar: Option<String>,
   pub banner: Option<String>,