diff --git a/Cargo.lock b/Cargo.lock
index 5461169..9d779b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1297,9 +1297,9 @@ dependencies = [
[[package]]
name = "rbx_asset"
-version = "0.4.0-pre1"
+version = "0.4.1"
source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "f042d87222a98142ec25d3b191bbd5377e52c75184bd367da3423a26b72e0c17"
+checksum = "7d8fb02364206550cb386babab0bb1fbfddf267eb2c300f28c8c5f42c797b671"
dependencies = [
"chrono",
"flate2",
diff --git a/validation/Cargo.toml b/validation/Cargo.toml
index cce1307..9515b6b 100644
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
submissions-api = { path = "api", features = ["internal"], default-features = false, registry = "strafesnet" }
async-nats = "0.40.0"
futures = "0.3.31"
-rbx_asset = { version = "0.4.0-pre1", registry = "strafesnet" }
+rbx_asset = { version = "0.4.1", registry = "strafesnet" }
rbx_binary = { version = "0.7.4", registry = "strafesnet"}
rbx_dom_weak = { version = "2.9.0", registry = "strafesnet"}
rbx_reflection_database = { version = "0.2.12", registry = "strafesnet"}
diff --git a/validation/src/create.rs b/validation/src/create.rs
index 31a57bd..44acf20 100644
--- a/validation/src/create.rs
+++ b/validation/src/create.rs
@@ -5,6 +5,7 @@ use crate::rbx_util::{get_mapinfo,read_dom,MapInfo,ReadDomError,GetMapInfoError,
pub enum Error{
CreatorTypeMustBeUser,
ModelInfoDownload(rbx_asset::cloud::GetError),
+ ModelLocationDownload(rbx_asset::cloud::GetError),
ModelFileDownload(rbx_asset::cloud::GetError),
ParseUserID(core::num::ParseIntError),
ParseModelVersion(core::num::ParseIntError),
@@ -47,12 +48,14 @@ impl crate::message_handler::MessageHandler{
let user_id:u64=user_id_string.parse().map_err(Error::ParseUserID)?;
let asset_version=info.revisionId.parse().map_err(Error::ParseModelVersion)?;
- // download the map model
- let model_data=self.cloud_context.get_asset_version(rbx_asset::cloud::GetAssetVersionRequest{
+ // download the location of the map model
+ let location=self.cloud_context.get_asset_version_location(rbx_asset::cloud::GetAssetVersionRequest{
asset_id:create_info.ModelID,
version:asset_version,
- }).await.map_err(Error::ModelFileDownload)?;
+ }).await.map_err(Error::ModelLocationDownload)?;
+ // download the map model
+ let model_data=self.cloud_context.get_asset(&location).await.map_err(Error::ModelFileDownload)?;
// decode dom (slow!)
let dom=read_dom(std::io::Cursor::new(model_data)).map_err(Error::ModelFileDecode)?;
diff --git a/validation/src/upload_mapfix.rs b/validation/src/upload_mapfix.rs
index 9eeee25..c2abd25 100644
--- a/validation/src/upload_mapfix.rs
+++ b/validation/src/upload_mapfix.rs
@@ -3,6 +3,7 @@ use crate::nats_types::UploadMapfixRequest;
#[allow(dead_code)]
#[derive(Debug)]
pub enum Error{
+ GetLocation(rbx_asset::cloud::GetError),
Get(rbx_asset::cloud::GetError),
Json(serde_json::Error),
Upload(rbx_asset::cookie::UploadError),
@@ -17,11 +18,14 @@ impl std::error::Error for Error{}
impl crate::message_handler::MessageHandler{
pub async fn upload_mapfix(&self,upload_info:UploadMapfixRequest)->Result<(),Error>{
- // download the map model version
- let model_data=self.cloud_context.get_asset_version(rbx_asset::cloud::GetAssetVersionRequest{
+ // download the location of the map model
+ let location=self.cloud_context.get_asset_version_location(rbx_asset::cloud::GetAssetVersionRequest{
asset_id:upload_info.ModelID,
version:upload_info.ModelVersion,
- }).await.map_err(Error::Get)?;
+ }).await.map_err(Error::GetLocation)?;
+
+ // download the map model
+ let model_data=self.cloud_context.get_asset(&location).await.map_err(Error::Get)?;
// upload the map to the strafesnet group
let _upload_response=self.cookie_context.upload(rbx_asset::cookie::UploadRequest{
diff --git a/validation/src/upload_submission.rs b/validation/src/upload_submission.rs
index 4c55c6f..d5f85ab 100644
--- a/validation/src/upload_submission.rs
+++ b/validation/src/upload_submission.rs
@@ -3,6 +3,7 @@ use crate::nats_types::UploadSubmissionRequest;
#[allow(dead_code)]
#[derive(Debug)]
pub enum Error{
+ GetLocation(rbx_asset::cloud::GetError),
Get(rbx_asset::cloud::GetError),
Json(serde_json::Error),
Create(rbx_asset::cookie::CreateError),
@@ -18,11 +19,14 @@ impl std::error::Error for Error{}
impl crate::message_handler::MessageHandler{
pub async fn upload_submission(&self,upload_info:UploadSubmissionRequest)->Result<(),Error>{
- // download the map model version
- let model_data=self.cloud_context.get_asset_version(rbx_asset::cloud::GetAssetVersionRequest{
+ // download the location of the map model
+ let location=self.cloud_context.get_asset_version_location(rbx_asset::cloud::GetAssetVersionRequest{
asset_id:upload_info.ModelID,
version:upload_info.ModelVersion,
- }).await.map_err(Error::Get)?;
+ }).await.map_err(Error::GetLocation)?;
+
+ // download the map model
+ let model_data=self.cloud_context.get_asset(&location).await.map_err(Error::Get)?;
// upload the map to the strafesnet group
let upload_response=self.cookie_context.create(rbx_asset::cookie::CreateRequest{
diff --git a/validation/src/validator.rs b/validation/src/validator.rs
index c0599f2..19eeee0 100644
--- a/validation/src/validator.rs
+++ b/validation/src/validator.rs
@@ -36,6 +36,7 @@ pub enum Error{
ScriptFlaggedIllegalKeyword(String),
ScriptBlocked(Option<submissions_api::types::ScriptID>),
ScriptNotYetReviewed(Option<submissions_api::types::ScriptID>),
+ ModelLocationDownload(rbx_asset::cloud::GetError),
ModelFileDownload(rbx_asset::cloud::GetError),
ModelFileDecode(ReadDomError),
ApiGetScriptPolicyFromHash(submissions_api::types::SingleItemError),
@@ -89,14 +90,17 @@ impl From<crate::nats_types::ValidateSubmissionRequest> for ValidateRequest{
impl crate::message_handler::MessageHandler{
pub async fn validate_inner(&self,validate_info:ValidateRequest)->Result<(),Error>{
- // download map
- let data=self.cloud_context.get_asset_version(rbx_asset::cloud::GetAssetVersionRequest{
+ // download the location of the map model
+ let location=self.cloud_context.get_asset_version_location(rbx_asset::cloud::GetAssetVersionRequest{
asset_id:validate_info.ModelID,
version:validate_info.ModelVersion,
- }).await.map_err(Error::ModelFileDownload)?;
+ }).await.map_err(Error::ModelLocationDownload)?;
+
+ // download the map model
+ let model_data=self.cloud_context.get_asset(&location).await.map_err(Error::ModelFileDownload)?;
// decode dom (slow!)
- let mut dom=read_dom(std::io::Cursor::new(data)).map_err(Error::ModelFileDecode)?;
+ let mut dom=read_dom(std::io::Cursor::new(model_data)).map_err(Error::ModelFileDecode)?;
/* VALIDATE MAP */