From 30292b7dc2cf7f248402e18ed7afb68dbb2b6745 Mon Sep 17 00:00:00 2001 From: Aiden Fujiwara <106630142+afujiwara-roblox@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:51:56 -0800 Subject: [PATCH] Upload images instead of decals (#72) * upload as image and not asset * upload image not decal * remove decal reference --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/commands/upload_image.rs | 4 ++-- src/roblox_web_api.rs | 2 +- src/sync_backend.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69986d4..de1e2ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1739,7 +1739,7 @@ dependencies = [ [[package]] name = "tarmac" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "backtrace", diff --git a/Cargo.toml b/Cargo.toml index 2be3e0e..22d58fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tarmac" description = "Resource compiler and asset manager for Roblox projects" -version = "0.8.1" +version = "0.8.2" authors = ["Lucien Greathouse "] edition = "2018" license = "MIT" diff --git a/src/commands/upload_image.rs b/src/commands/upload_image.rs index 6462db4..74b37cd 100644 --- a/src/commands/upload_image.rs +++ b/src/commands/upload_image.rs @@ -2,7 +2,7 @@ use fs_err as fs; use crate::{ options::{GlobalOptions, UploadImageOptions}, - roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials, DECAL}, + roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials, IMAGE}, roblox_web_api_types::{ImageUploadData, ImageUploadMetadata}, }; @@ -18,7 +18,7 @@ pub fn upload_image( let upload_data = ImageUploadData { image_data: image_data.into(), image_metadata: ImageUploadMetadata::new( - DECAL.to_string(), + IMAGE.to_string(), options.name.to_string(), options.description.to_string(), options.user_id, diff --git a/src/roblox_web_api.rs b/src/roblox_web_api.rs index fcf1cfa..9e24488 100644 --- a/src/roblox_web_api.rs +++ b/src/roblox_web_api.rs @@ -25,7 +25,7 @@ const OPEN_CLOUD_ASSET_OPERATIONS_USER_AUTH: &str = const OPEN_CLOUD_ASSET_OPERATIONS: &str = "https://apis.roblox.com/assets/v1/operations"; const OPEN_CLOUD_API_KEY_HEADER: &str = "X-API-Key"; -pub const DECAL: &str = "Decal"; +pub const IMAGE: &str = "Image"; pub struct RobloxOpenCloudCredentials { auth: RobloxOpenCloudAuth, diff --git a/src/sync_backend.rs b/src/sync_backend.rs index c13ba4e..7011fd5 100644 --- a/src/sync_backend.rs +++ b/src/sync_backend.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, io, path::Path, thread, time::Duration}; -use crate::roblox_web_api::{RobloxApiClient, RobloxApiError, DECAL}; +use crate::roblox_web_api::{RobloxApiClient, RobloxApiError, IMAGE}; use crate::roblox_web_api_types::{ ImageUploadData, ImageUploadMetadata, RobloxAuthenticationError, }; @@ -45,7 +45,7 @@ impl<'a> SyncBackend for RobloxSyncBackend<'a> { let upload_data = ImageUploadData { image_data: Cow::Owned(data.contents), image_metadata: ImageUploadMetadata::new( - DECAL.to_string(), + IMAGE.to_string(), data.name.to_string(), "Uploaded by Tarmac.".to_string(), None,