refactor(core/models): move models into v0 module
This commit is contained in:
@@ -17,13 +17,7 @@ macro_rules! auto_derived {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
mod bots;
|
pub mod v0;
|
||||||
mod files;
|
|
||||||
mod users;
|
|
||||||
|
|
||||||
pub use bots::*;
|
|
||||||
pub use files::*;
|
|
||||||
pub use users::*;
|
|
||||||
|
|
||||||
/// Utility function to check if a boolean value is false
|
/// Utility function to check if a boolean value is false
|
||||||
pub fn if_false(t: &bool) -> bool {
|
pub fn if_false(t: &bool) -> bool {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::User;
|
use super::User;
|
||||||
|
|
||||||
auto_derived!(
|
auto_derived!(
|
||||||
/// Bot
|
/// Bot
|
||||||
7
crates/core/models/src/v0/mod.rs
Normal file
7
crates/core/models/src/v0/mod.rs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
mod bots;
|
||||||
|
mod files;
|
||||||
|
mod users;
|
||||||
|
|
||||||
|
pub use bots::*;
|
||||||
|
pub use files::*;
|
||||||
|
pub use users::*;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::File;
|
use super::File;
|
||||||
|
|
||||||
auto_derived!(
|
auto_derived!(
|
||||||
/// User
|
/// User
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
use revolt_database::{util::reference::Reference, Database};
|
use revolt_database::{util::reference::Reference, Database};
|
||||||
use revolt_models::FetchBotResponse;
|
use revolt_models::v0::FetchBotResponse;
|
||||||
use revolt_quark::{models::User, Error, Result};
|
use revolt_quark::{models::User, Error, Result};
|
||||||
use rocket::{serde::json::Json, State};
|
use rocket::{serde::json::Json, State};
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ pub async fn fetch_bot(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Ok(Json(FetchBotResponse {
|
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)?,
|
db.fetch_user(&bot.id).await.map_err(Error::from_core)?,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use revolt_database::Database;
|
use revolt_database::Database;
|
||||||
use revolt_models::PublicBot;
|
use revolt_models::v0::PublicBot;
|
||||||
use revolt_quark::{models::User, Error, Ref, Result};
|
use revolt_quark::{models::User, Error, Ref, Result};
|
||||||
|
|
||||||
use rocket::serde::json::Json;
|
use rocket::serde::json::Json;
|
||||||
|
|||||||
Reference in New Issue
Block a user