refactor: update scripting

Author: jacobtread

scripting/src/vtftk.ts

@@ -207,7 +207,7 @@ export interface ItemModel {
   /**
    * Configuration for the item image
    */
-  image: ItemImageConfig;
+  config: ItemConfig;
   /**
    * Order of the item within the UI
    */

src-tauri/src/script/ops/vtftk.rs

@@ -1,8 +1,11 @@
 use std::{cell::RefCell, rc::Rc};
 
 use crate::{
-    database::entity::{items::ItemModel, sounds::SoundModel},
-    overlay::{OverlayMessage, PartialItemModel},
+    database::entity::{
+        items::{ItemModel, ItemWithSounds},
+        sounds::SoundModel,
+    },
+    overlay::OverlayMessage,
     script::runtime::ScriptRuntimeDataExt,
 };
 use anyhow::Context;
@@ -32,20 +35,9 @@ pub async fn op_vtftk_get_items_by_names(
     state: Rc<RefCell<OpState>>,
     #[serde] names: Vec<String>,
     ignore_case: bool,
-) -> anyhow::Result<Vec<PartialItemModel>> {
+) -> anyhow::Result<Vec<ItemWithSounds>> {
     let db = state.db()?;
-    let items: Vec<PartialItemModel> =
-        ItemModel::get_by_names_with_sounds(&db, &names, ignore_case)
-            .await?
-            .into_iter()
-            .map(|item| PartialItemModel {
-                id: item.item.id,
-                config: item.item.config,
-                impact_sound_ids: item.impact_sounds_ids,
-                windup_sound_ids: item.windup_sounds_ids,
-            })
-            .collect();
-
+    let items = ItemModel::get_by_names_with_sounds(&db, &names, ignore_case).await?;
     Ok(items)
 }
 
@@ -55,18 +47,9 @@ pub async fn op_vtftk_get_items_by_names(
 pub async fn op_vtftk_get_items_by_ids(
     state: Rc<RefCell<OpState>>,
     #[serde] ids: Vec<Uuid>,
-) -> anyhow::Result<Vec<PartialItemModel>> {
+) -> anyhow::Result<Vec<ItemWithSounds>> {
     let db = state.db()?;
-    let items: Vec<PartialItemModel> = ItemModel::get_by_ids_with_sounds(&db, &ids)
-        .await?
-        .into_iter()
-        .map(|item| PartialItemModel {
-            id: item.item.id,
-            config: item.item.config,
-            impact_sound_ids: item.impact_sounds_ids,
-            windup_sound_ids: item.windup_sounds_ids,
-        })
-        .collect();
+    let items = ItemModel::get_by_ids_with_sounds(&db, &ids).await?;
 
     Ok(items)
 }