From 6332ea66d9e7fe194a07e838e1afc51368ff6e25 Mon Sep 17 00:00:00 2001
From: Jake Probst <jake.probst@gmail.com>
Date: Sun, 25 Aug 2019 04:50:11 -0700
Subject: [PATCH] deref eusersettings, pub stuff

---
 src/login/models.rs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/login/models.rs b/src/login/models.rs
index 7c37b5e..c5fb059 100644
--- a/src/login/models.rs
+++ b/src/login/models.rs
@@ -11,14 +11,22 @@ use diesel::backend::Backend;
 
 use libpso::character::settings;
 
-#[derive(Debug, AsExpression, FromSqlRow)]
-#[sql_type="sql_types::Binary"]
-pub struct EUserSettings(pub settings::UserSettings);
+use elseware::schema::*;
 
 //const ELSEWHERE_COST: u32 = bcrypt::DEFAULT_COST;
 const ELSEWHERE_COST: u32 = 5;
 
-use elseware::schema::*;
+#[derive(Debug, AsExpression, FromSqlRow)]
+#[sql_type="sql_types::Binary"]
+pub struct EUserSettings(pub settings::UserSettings);
+
+impl std::ops::Deref for EUserSettings {
+    type Target = settings::UserSettings;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
 
 #[derive(Queryable, Identifiable, Debug)]
 pub struct UserAccount {
@@ -53,8 +61,8 @@ impl NewUser {
 #[belongs_to(UserAccount, foreign_key="user_id")]
 #[table_name="user_settings"]
 pub struct UserSettings {
-    id: i32,
-    user_id: i32,
+    pub id: i32,
+    pub user_id: i32,
     //settings: Vec<u8>,
     pub settings: EUserSettings,
 }