diff options
| author | Dessalines <tyhou13@gmx.com> | 2019-08-13 19:52:43 -0700 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2019-08-13 19:52:43 -0700 |
| commit | d7ab85ab70478f1ec440c920d726d08b145cef5e (patch) | |
| tree | cc799c34a29c4e6070a3f3a34823e7c091cddaad /server/src/db/user.rs | |
| parent | ad4dbbcd7726e75aea1e06111a1af3039cbeca70 (diff) | |
Squashed commit of the following:
commit ecd6c5a2f47cbbb2fc4bf482fadd78380303a904
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:49:38 2019 -0700
Adding some docs
commit 3babd09affb1920da3d0a0ceb7e24c8aeeb9cf1a
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 19:28:46 2019 -0700
Adding save user settings
commit 6e8da9cc9e522d0da668bfa31944c3348cc79620
Merge: 3246d5d c148eef
Author: Dessalines <happydooby@gmail.com>
Date: Tue Aug 13 17:26:25 2019 -0700
Merge branch 'dev' into nsfw
commit b3d4a5c4ce441bcc664704aba44cedb51d887599
Author: Dessalines <happydooby@gmail.com>
Date: Sun Aug 11 20:55:09 2019 -0700
nsfw mostly done, except for settings page.
Diffstat (limited to 'server/src/db/user.rs')
| -rw-r--r-- | server/src/db/user.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/server/src/db/user.rs b/server/src/db/user.rs index aed5e890..b794524c 100644 --- a/server/src/db/user.rs +++ b/server/src/db/user.rs @@ -18,7 +18,8 @@ pub struct User_ { pub admin: bool, pub banned: bool, pub published: chrono::NaiveDateTime, - pub updated: Option<chrono::NaiveDateTime> + pub updated: Option<chrono::NaiveDateTime>, + pub show_nsfw: bool, } #[derive(Insertable, AsChangeset, Clone)] @@ -31,7 +32,8 @@ pub struct UserForm { pub admin: bool, pub banned: bool, pub email: Option<String>, - pub updated: Option<chrono::NaiveDateTime> + pub updated: Option<chrono::NaiveDateTime>, + pub show_nsfw: bool, } impl Crud<UserForm> for User_ { @@ -77,6 +79,7 @@ pub struct Claims { pub id: i32, pub username: String, pub iss: String, + pub show_nsfw: bool, } impl Claims { @@ -96,6 +99,7 @@ impl User_ { id: self.id, username: self.name.to_owned(), iss: self.fedi_name.to_owned(), + show_nsfw: self.show_nsfw, }; encode(&Header::default(), &my_claims, Settings::get().jwt_secret.as_ref()).unwrap() } @@ -133,7 +137,8 @@ mod tests { email: None, admin: false, banned: false, - updated: None + updated: None, + show_nsfw: false, }; let inserted_user = User_::create(&conn, &new_user).unwrap(); @@ -149,7 +154,8 @@ mod tests { admin: false, banned: false, published: inserted_user.published, - updated: None + updated: None, + show_nsfw: false, }; let read_user = User_::read(&conn, inserted_user.id).unwrap(); |