diff --git a/crates/core/database/src/models/discover_requests/model.rs b/crates/core/database/src/models/discover_requests/model.rs index 879c95af..a629162d 100644 --- a/crates/core/database/src/models/discover_requests/model.rs +++ b/crates/core/database/src/models/discover_requests/model.rs @@ -15,7 +15,6 @@ auto_derived!( /// Discover request pub struct DiscoverRequest { /// The type of request. - #[serde(rename = "type")] pub request_type: DiscoverRequestType, /// The ID of the bot/server pub request_id: String, diff --git a/crates/core/database/src/models/discover_requests/ops/mongodb.rs b/crates/core/database/src/models/discover_requests/ops/mongodb.rs index 088f273e..8b1a6ad1 100644 --- a/crates/core/database/src/models/discover_requests/ops/mongodb.rs +++ b/crates/core/database/src/models/discover_requests/ops/mongodb.rs @@ -61,7 +61,7 @@ impl AbstractDiscoverRequest for MongoDb { find_one, DISCOVER_COL, doc! {"request_type": bson::to_bson(&request_type).expect("failed to serialize"), "request_id": item} - )?.ok_or_else(|| create_database_error!("find_one", DISCOVER_COL)) + )?.ok_or_else(|| create_error!(NotFound)) } /// Remove discover request @@ -85,6 +85,6 @@ impl AbstractDiscoverRequest for MongoDb { find_one, DISCOVER_BANS_COL, doc! {"request_type": bson::to_bson(&item_type).expect("failed to serialize"), "request_id": item} - )?.ok_or_else(|| create_database_error!("find_one", DISCOVER_COL)).map(|_: DiscoverBan| true) + )?.ok_or_else(|| create_error!(NotFound)).map(|_: DiscoverBan| true) } } diff --git a/crates/core/models/src/v0/discover.rs b/crates/core/models/src/v0/discover.rs index 7f9187c4..27b4a50f 100644 --- a/crates/core/models/src/v0/discover.rs +++ b/crates/core/models/src/v0/discover.rs @@ -17,6 +17,7 @@ auto_derived!( #[serde(rename = "type")] pub request_type: DiscoverRequestType, /// The ID of the bot/server + #[serde(rename = "id")] pub request_id: String, /// status of the request pub status: DiscoverRequestStatus,