From 7bbc871e3402fdedec8f07c8969a8877b87fae18 Mon Sep 17 00:00:00 2001 From: curly Date: Thu, 9 Feb 2023 09:27:58 -0700 Subject: message_list, delete_user, limits --- src/database/types.rs | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'src/database') diff --git a/src/database/types.rs b/src/database/types.rs index 1a8ab86..a0bfd12 100644 --- a/src/database/types.rs +++ b/src/database/types.rs @@ -32,17 +32,27 @@ impl std::convert::From for sqlite::Value { pub struct User { username: String, id: UID, + deleted: bool, } impl User { pub fn new(username: String, id: UID) -> User { User { username, id, + deleted: false, } } - pub fn id(&self) -> UID { - self.id + pub fn construct(username: String, id: UID, deleted: bool) -> User { + User { + username, + id, + deleted, + } + } + + pub fn deleted(&self) -> bool { + self.deleted } } @@ -67,6 +77,11 @@ impl std::convert::From for UID { } } } +impl std::convert::From for i64 { + fn from(t :UID) -> i64 { + t.0 as i64 + } +} impl std::convert::From for sqlite::Value { fn from(t: UID) -> sqlite::Value { (t.0 as i64).into() @@ -83,16 +98,6 @@ pub struct Message { date: Date, } impl Message { - pub fn new(message: String, sender: &User, id: UID, reply_to: Option) -> Message { - Message { - id, - sender: sender.id(), - message, - reply_to, - deleted: false, - date: Date::now(), - } - } pub fn construct(msg: String, sender: UID, id: UID, reply_to: Option, date: Date, deleted: bool) -> Message { Message { date: date, -- cgit v1.2.3