diff --git a/validation/src/check.rs b/validation/src/check.rs index 7c2b70d..24927c9 100644 --- a/validation/src/check.rs +++ b/validation/src/check.rs @@ -227,9 +227,9 @@ impl<ID:Copy+Eq+std::hash::Hash> AtLeastOneMatchingAndNoExtraCheckContext<ID>{ } pub struct MapInfoOwned{ - display_name:String, - creator:String, - game_id:GameID, + pub display_name:String, + pub creator:String, + pub game_id:GameID, } // crazy! diff --git a/validation/src/check_mapfix.rs b/validation/src/check_mapfix.rs index 09585dd..2187fe3 100644 --- a/validation/src/check_mapfix.rs +++ b/validation/src/check_mapfix.rs @@ -1,4 +1,4 @@ -use crate::check::{CheckStatus,CheckReportAndVersion}; +use crate::check::CheckReportAndVersion; use crate::nats_types::CheckMapfixRequest; #[allow(dead_code)] @@ -24,22 +24,22 @@ impl crate::message_handler::MessageHandler{ Ok(CheckReportAndVersion{status,version})=>{ match status{ // update the mapfix model status to submitted - CheckStatus::Passed{display_name,creator,game_id}=> + Ok(map_info)=> self.api.action_mapfix_submitted( submissions_api::types::ActionMapfixSubmittedRequest{ MapfixID:mapfix_id, ModelVersion:version, - DisplayName:display_name, - Creator:creator, - GameID:game_id as u32, + DisplayName:map_info.display_name, + Creator:map_info.creator, + GameID:map_info.game_id as u32, } ).await.map_err(Error::ApiActionMapfixCheck)?, // update the mapfix model status to request changes - CheckStatus::Failed{report}=> + Err(report)=> self.api.action_mapfix_request_changes( submissions_api::types::ActionMapfixRequestChangesRequest{ MapfixID:mapfix_id, - ErrorMessage:report.to_string(), + ErrorMessage:report, } ).await.map_err(Error::ApiActionMapfixCheck)?, } diff --git a/validation/src/check_submission.rs b/validation/src/check_submission.rs index b20f976..d0bd80c 100644 --- a/validation/src/check_submission.rs +++ b/validation/src/check_submission.rs @@ -1,4 +1,4 @@ -use crate::check::{CheckStatus,CheckReportAndVersion}; +use crate::check::CheckReportAndVersion; use crate::nats_types::CheckSubmissionRequest; #[allow(dead_code)] @@ -24,22 +24,22 @@ impl crate::message_handler::MessageHandler{ Ok(CheckReportAndVersion{status,version})=>{ match status{ // update the submission model status to submitted - CheckStatus::Passed{display_name,creator,game_id}=> + Ok(map_info)=> self.api.action_submission_submitted( submissions_api::types::ActionSubmissionSubmittedRequest{ SubmissionID:submission_id, ModelVersion:version, - DisplayName:display_name, - Creator:creator, - GameID:game_id as u32, + DisplayName:map_info.display_name, + Creator:map_info.creator, + GameID:map_info.game_id as u32, } ).await.map_err(Error::ApiActionSubmissionCheck)?, // update the submission model status to request changes - CheckStatus::Failed{report}=> + Err(report)=> self.api.action_submission_request_changes( submissions_api::types::ActionSubmissionRequestChangesRequest{ SubmissionID:submission_id, - ErrorMessage:report.to_string(), + ErrorMessage:report, } ).await.map_err(Error::ApiActionSubmissionCheck)?, }