validator: use different endpoints to fill in the submission details
This commit is contained in:
parent
d0634fc141
commit
a3d644f572
@ -5,8 +5,11 @@ use crate::rbx_util::{get_mapinfo,read_dom,MapInfo,ReadDomError,GetMapInfoError,
|
|||||||
pub enum Error{
|
pub enum Error{
|
||||||
ModelVersionsPage(rbx_asset::cookie::PageError),
|
ModelVersionsPage(rbx_asset::cookie::PageError),
|
||||||
EmptyVersionsPage,
|
EmptyVersionsPage,
|
||||||
WrongCreatorType,
|
CreatorTypeMustBeUser(rbx_asset::cookie::CreatorType),
|
||||||
|
ModelDetails(rbx_asset::cookie::GetError),
|
||||||
|
ModelInfoDownload(rbx_asset::cookie::GetAssetV2Error),
|
||||||
ModelFileDownload(rbx_asset::cookie::GetError),
|
ModelFileDownload(rbx_asset::cookie::GetError),
|
||||||
|
NoLocations,
|
||||||
ModelFileDecode(ReadDomError),
|
ModelFileDecode(ReadDomError),
|
||||||
GetMapInfo(GetMapInfoError),
|
GetMapInfo(GetMapInfoError),
|
||||||
ParseGameID(ParseGameIDError),
|
ParseGameID(ParseGameIDError),
|
||||||
@ -32,28 +35,32 @@ pub struct CreateResult{
|
|||||||
}
|
}
|
||||||
impl crate::message_handler::MessageHandler{
|
impl crate::message_handler::MessageHandler{
|
||||||
pub async fn create_inner(&self,create_info:CreateRequest)->Result<CreateResult,Error>{
|
pub async fn create_inner(&self,create_info:CreateRequest)->Result<CreateResult,Error>{
|
||||||
// discover the latest asset version
|
// discover asset creator
|
||||||
let asset_versions_page=self.cookie_context.get_asset_versions_page(rbx_asset::cookie::AssetVersionsPageRequest{
|
let creator_fut=async{
|
||||||
asset_id:create_info.ModelID,
|
self.cookie_context.get_asset_details(
|
||||||
cursor:None
|
rbx_asset::cookie::GetAssetDetailsRequest{asset_id:create_info.ModelID}
|
||||||
}).await.map_err(Error::ModelVersionsPage)?;
|
).await.map_err(Error::ModelDetails)
|
||||||
|
};
|
||||||
|
|
||||||
// grab version info
|
// download the map model
|
||||||
let first_version=asset_versions_page.data.first().ok_or(Error::EmptyVersionsPage)?;
|
let asset_fut=async{
|
||||||
|
let asset_info=self.cookie_context.get_asset_v2(rbx_asset::cookie::GetAssetRequest{
|
||||||
|
asset_id:create_info.ModelID,
|
||||||
|
version:None,
|
||||||
|
}).await.map_err(Error::ModelInfoDownload)?;
|
||||||
|
|
||||||
if first_version.creatorType!=rbx_asset::cookie::CreatorType::User{
|
let location=asset_info.info.locations.first().ok_or(Error::NoLocations)?;
|
||||||
return Err(Error::WrongCreatorType);
|
let data=self.cookie_context.get_asset_v2_download(location).await.map_err(Error::ModelFileDownload)?;
|
||||||
|
|
||||||
|
Ok((asset_info.version,data))
|
||||||
|
};
|
||||||
|
|
||||||
|
let (details,(asset_version,model_data))=tokio::try_join!(creator_fut,asset_fut)?;
|
||||||
|
|
||||||
|
if details.Creator.CreatorType!=rbx_asset::cookie::CreatorType::User{
|
||||||
|
return Err(Error::CreatorTypeMustBeUser(details.Creator.CreatorType));
|
||||||
}
|
}
|
||||||
|
|
||||||
let asset_creator_id=first_version.creatorTargetId;
|
|
||||||
let asset_version=first_version.assetVersionNumber;
|
|
||||||
|
|
||||||
// download the map model version
|
|
||||||
let model_data=self.cookie_context.get_asset(rbx_asset::cookie::GetAssetRequest{
|
|
||||||
asset_id:create_info.ModelID,
|
|
||||||
version:Some(asset_version),
|
|
||||||
}).await.map_err(Error::ModelFileDownload)?;
|
|
||||||
|
|
||||||
// decode dom (slow!)
|
// decode dom (slow!)
|
||||||
let dom=read_dom(&mut std::io::Cursor::new(model_data)).map_err(Error::ModelFileDecode)?;
|
let dom=read_dom(&mut std::io::Cursor::new(model_data)).map_err(Error::ModelFileDecode)?;
|
||||||
|
|
||||||
@ -67,7 +74,7 @@ impl crate::message_handler::MessageHandler{
|
|||||||
let game_id=game_id.map_err(Error::ParseGameID)?;
|
let game_id=game_id.map_err(Error::ParseGameID)?;
|
||||||
|
|
||||||
Ok(CreateResult{
|
Ok(CreateResult{
|
||||||
AssetOwner:asset_creator_id as i64,
|
AssetOwner:details.Creator.Id as i64,
|
||||||
DisplayName:display_name.unwrap_or_default().to_owned(),
|
DisplayName:display_name.unwrap_or_default().to_owned(),
|
||||||
Creator:creator.unwrap_or_default().to_owned(),
|
Creator:creator.unwrap_or_default().to_owned(),
|
||||||
GameID:game_id as i32,
|
GameID:game_id as i32,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user