diff --git a/src/api/core/folders.rs b/src/api/core/folders.rs index fdf717c..bce831e 100644 --- a/src/api/core/folders.rs +++ b/src/api/core/folders.rs @@ -41,7 +41,7 @@ fn post_folders(data: Json, headers: Headers, conn: DbConn) -> Result JsonValue { use util::get_display_size; - // TODO: Change all references to localhost (maybe put it in .env?) - let host = "http://localhost:8000"; - - let web_path = format!("{}/attachments/{}/{}", host, self.cipher_uuid, self.id); + let web_path = format!("/attachments/{}/{}", self.cipher_uuid, self.id); let display_size = get_display_size(self.file_size); json!({ @@ -57,8 +54,6 @@ use db::schema::attachments; /// Database methods impl Attachment { pub fn save(&self, conn: &DbConn) -> bool { - // TODO: Update modified date - match diesel::replace_into(attachments::table) .values(self) .execute(&**conn) { diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs index 20b7b86..b81dec0 100644 --- a/src/db/models/cipher.rs +++ b/src/db/models/cipher.rs @@ -82,11 +82,11 @@ impl Cipher { }) } - pub fn save(&self, conn: &DbConn) -> bool { - // TODO: Update modified date + pub fn save(&mut self, conn: &DbConn) -> bool { + self.updated_at = Utc::now().naive_utc(); match diesel::replace_into(ciphers::table) - .values(self) + .values(&*self) .execute(&**conn) { Ok(1) => true, // One row inserted _ => false, diff --git a/src/db/models/device.rs b/src/db/models/device.rs index a22f45f..346b5d2 100644 --- a/src/db/models/device.rs +++ b/src/db/models/device.rs @@ -82,11 +82,11 @@ use db::schema::devices; /// Database methods impl Device { - pub fn save(&self, conn: &DbConn) -> bool { - // TODO: Update modified date + pub fn save(&mut self, conn: &DbConn) -> bool { + self.updated_at = Utc::now().naive_utc(); match diesel::replace_into(devices::table) - .values(self) + .values(&*self) .execute(&**conn) { Ok(1) => true, // One row inserted _ => false, diff --git a/src/db/models/folder.rs b/src/db/models/folder.rs index 1856176..0dea434 100644 --- a/src/db/models/folder.rs +++ b/src/db/models/folder.rs @@ -51,11 +51,11 @@ use db::schema::folders; /// Database methods impl Folder { - pub fn save(&self, conn: &DbConn) -> bool { - // TODO: Update modified date + pub fn save(&mut self, conn: &DbConn) -> bool { + self.updated_at = Utc::now().naive_utc(); match diesel::replace_into(folders::table) - .values(self) + .values(&*self) .execute(&**conn) { Ok(1) => true, // One row inserted _ => false, diff --git a/src/db/models/user.rs b/src/db/models/user.rs index ce6807a..f1aecd6 100644 --- a/src/db/models/user.rs +++ b/src/db/models/user.rs @@ -138,11 +138,11 @@ use db::schema::users; /// Database methods impl User { - pub fn save(&self, conn: &DbConn) -> bool { - // TODO: Update modified date + pub fn save(&mut self, conn: &DbConn) -> bool { + self.updated_at = Utc::now().naive_utc(); match diesel::replace_into(users::table) // Insert or update - .values(self) + .values(&*self) .execute(&**conn) { Ok(1) => true, // One row inserted _ => false,