diff --git a/crates/core/models/src/lib.rs b/crates/core/models/src/lib.rs index 8d8b50d5..03f6c818 100644 --- a/crates/core/models/src/lib.rs +++ b/crates/core/models/src/lib.rs @@ -17,13 +17,7 @@ macro_rules! auto_derived { }; } -mod bots; -mod files; -mod users; - -pub use bots::*; -pub use files::*; -pub use users::*; +pub mod v0; /// Utility function to check if a boolean value is false pub fn if_false(t: &bool) -> bool { diff --git a/crates/core/models/src/bots.rs b/crates/core/models/src/v0/bots.rs similarity index 99% rename from crates/core/models/src/bots.rs rename to crates/core/models/src/v0/bots.rs index f558087f..43a268b8 100644 --- a/crates/core/models/src/bots.rs +++ b/crates/core/models/src/v0/bots.rs @@ -1,4 +1,4 @@ -use crate::User; +use super::User; auto_derived!( /// Bot diff --git a/crates/core/models/src/files.rs b/crates/core/models/src/v0/files.rs similarity index 100% rename from crates/core/models/src/files.rs rename to crates/core/models/src/v0/files.rs diff --git a/crates/core/models/src/v0/mod.rs b/crates/core/models/src/v0/mod.rs new file mode 100644 index 00000000..927b1c92 --- /dev/null +++ b/crates/core/models/src/v0/mod.rs @@ -0,0 +1,7 @@ +mod bots; +mod files; +mod users; + +pub use bots::*; +pub use files::*; +pub use users::*; diff --git a/crates/core/models/src/users.rs b/crates/core/models/src/v0/users.rs similarity index 99% rename from crates/core/models/src/users.rs rename to crates/core/models/src/v0/users.rs index bf52cafc..2671d28b 100644 --- a/crates/core/models/src/users.rs +++ b/crates/core/models/src/v0/users.rs @@ -1,4 +1,4 @@ -use crate::File; +use super::File; auto_derived!( /// User diff --git a/crates/delta/src/routes/bots/fetch.rs b/crates/delta/src/routes/bots/fetch.rs index 41aee968..7ccac797 100644 --- a/crates/delta/src/routes/bots/fetch.rs +++ b/crates/delta/src/routes/bots/fetch.rs @@ -1,5 +1,5 @@ use revolt_database::{util::reference::Reference, Database}; -use revolt_models::FetchBotResponse; +use revolt_models::v0::FetchBotResponse; use revolt_quark::{models::User, Error, Result}; use rocket::{serde::json::Json, State}; @@ -23,7 +23,7 @@ pub async fn fetch_bot( } Ok(Json(FetchBotResponse { - user: revolt_models::User::from( + user: revolt_models::v0::User::from( db.fetch_user(&bot.id).await.map_err(Error::from_core)?, None, ) diff --git a/crates/delta/src/routes/bots/fetch_public.rs b/crates/delta/src/routes/bots/fetch_public.rs index 87472f1c..796dc43e 100644 --- a/crates/delta/src/routes/bots/fetch_public.rs +++ b/crates/delta/src/routes/bots/fetch_public.rs @@ -1,5 +1,5 @@ use revolt_database::Database; -use revolt_models::PublicBot; +use revolt_models::v0::PublicBot; use revolt_quark::{models::User, Error, Ref, Result}; use rocket::serde::json::Json;