jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

deref eusersettings, pub stuff

Browse Source
This commit is contained in:
Jake Probst 2019-08-25 04:50:11 -07:00
parent ba43eeee58
commit 6332ea66d9
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/login/models.rs
View File

@ -11,14 +11,22 @@ use diesel::backend::Backend;
use libpso::character::settings; use libpso::character::settings;
#[derive(Debug, AsExpression, FromSqlRow)] use elseware::schema::*;
#[sql_type="sql_types::Binary"]
pub struct EUserSettings(pub settings::UserSettings);
//const ELSEWHERE_COST: u32 = bcrypt::DEFAULT_COST; //const ELSEWHERE_COST: u32 = bcrypt::DEFAULT_COST;
const ELSEWHERE_COST: u32 = 5; 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)] #[derive(Queryable, Identifiable, Debug)]
pub struct UserAccount { pub struct UserAccount {
@ -53,8 +61,8 @@ impl NewUser {
#[belongs_to(UserAccount, foreign_key="user_id")] #[belongs_to(UserAccount, foreign_key="user_id")]
#[table_name="user_settings"] #[table_name="user_settings"]
pub struct UserSettings { pub struct UserSettings {
id: i32, pub id: i32,
user_id: i32, pub user_id: i32,
//settings: Vec<u8>, //settings: Vec<u8>,
pub settings: EUserSettings, pub settings: EUserSettings,
} }