StrafesNET/maps-service
4
Fork 4
Code Issues 22 Pull Requests 2 Packages Projects Releases Wiki Activity

validator: refactor + remove mapfix capability

Browse Source
This commit is contained in:
Rhys Lloyd
2025-03-31 17:57:00 -07:00
parent 01785bb190
commit ade54ee662
13 changed files with 247 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
validation/src/upload_mapfix.rs
View File

@@ -1,4 +1,4 @@
use crate::nats_types::UploadFixRequest;
use crate::nats_types::UploadMapfixRequest;
#[allow(dead_code)]
#[derive(Debug)]
@@ -6,8 +6,7 @@ pub enum UploadError{
Get(rbx_asset::cookie::GetError),
Json(serde_json::Error),
Upload(rbx_asset::cookie::UploadError),
ApiActionSubmissionUploaded(submissions_api::Error),
Unimplemented,
ApiActionMapfixUploaded(submissions_api::Error),
}
impl std::fmt::Display for UploadError{
fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -16,34 +15,23 @@ impl std::fmt::Display for UploadError{
}
impl std::error::Error for UploadError{}
pub struct Uploader{
roblox_cookie:rbx_asset::cookie::CookieContext,
group_id:Option<u64>,
api_internal:submissions_api::internal::Context,
}
pub struct Uploader(crate::uploader::Uploader);
impl Uploader{
pub const fn new(
roblox_cookie:rbx_asset::cookie::CookieContext,
group_id:Option<u64>,
api_internal:submissions_api::internal::Context,
)->Self{
Self{
roblox_cookie,
group_id,
api_internal,
}
pub const fn new(inner:crate::uploader::Uploader)->Self{
Self(inner)
}
pub async fn upload(&self,upload_info:UploadFixRequest)->Result<(),UploadError>{
pub async fn upload(&self,upload_info:UploadMapfixRequest)->Result<(),UploadError>{
let Self(uploader)=self;
// download the map model version
let model_data=self.roblox_cookie.get_asset(rbx_asset::cookie::GetAssetRequest{
let model_data=uploader.roblox_cookie.get_asset(rbx_asset::cookie::GetAssetRequest{
asset_id:upload_info.ModelID,
version:Some(upload_info.ModelVersion),
}).await.map_err(UploadError::Get)?;
// upload the map to the strafesnet group
let _upload_response=self.roblox_cookie.upload(rbx_asset::cookie::UploadRequest{
let _upload_response=uploader.roblox_cookie.upload(rbx_asset::cookie::UploadRequest{
assetid:upload_info.TargetAssetID,
groupId:self.group_id,
groupId:uploader.group_id,
name:None,
description:None,
ispublic:None,
@@ -52,14 +40,10 @@ impl Uploader{
// that's it, the database entry does not need to be changed.
//TEMP
return Err(UploadError::Unimplemented);
// mark submission as uploaded, TargetAssetID is unchanged
self.api_internal.action_submission_uploaded(submissions_api::types::ActionSubmissionUploadedRequest{
SubmissionID:upload_info.SubmissionID,
UploadedAssetID:0, //TEMP
}).await.map_err(UploadError::ApiActionSubmissionUploaded)?;
// mark mapfix as uploaded, TargetAssetID is unchanged
uploader.api.action_mapfix_uploaded(submissions_api::types::ActionMapfixUploadedRequest{
MapfixID:upload_info.MapfixID,
}).await.map_err(UploadError::ApiActionMapfixUploaded)?;
Ok(())
}