Merge pull request #696 from txm3278/tminz-foundry-warnings

Fix Foundry Deprecation warnings
otigon · Apr 9, 2024 · 2c587c2 · 2c587c2
2 parents 2928ab3 + 42fb2dd
commit 2c587c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/active-effects/handleActiveEffects.js b/src/active-effects/handleActiveEffects.js
@@ -22,7 +22,7 @@ export async function createActiveEffects(effect) {
         debug("Failed to find the Token for the Active Effect")
         return;
     }
-    const aeNameField = effect.label + `${aeToken.id}`
+    const aeNameField = (effect.name ?? effect.label) + `${aeToken.id}`
     const checkAnim = Sequencer.EffectManager.getEffects({ object: aeToken, name: aeNameField }).length > 0
     if (checkAnim) {
         debug("Animation is already present on the Token, returning.")
@@ -124,7 +124,7 @@ export async function toggleActiveEffects(effect, toggle) {
 export async function checkConcentration(effect) {
 
     // Check effect label and return if it is not equal to "concentrating"
-    const label = effect.label || "";
+    const label = (effect.name ?? effect.label) || "";
     if (label.toLowerCase() !== "concentrating") { return; }
 
     // Get Originating Item. If no Origin, return

diff --git a/src/formApps/Menus/Components/copyitem/copyToFrom.js b/src/formApps/Menus/Components/copyitem/copyToFrom.js
@@ -25,7 +25,7 @@ export function copyToFrom(animation, item, autorecSettings, isAE) {
       onPress: async () => {
          if (!animation._data.isEnabled) { return; }
 
-         let name = isAE ? item.label : item.name;
+         let name = item.name ?? item.label;
 
          const isInAutorec = isAE
             ? AAAutorecFunctions.singleMenuSearch(AAAutorecFunctions.sortAndFilterMenus(autorecSettings), AAAutorecFunctions.rinseName(name))

diff --git a/src/system-handlers/findAnimation.js b/src/system-handlers/findAnimation.js
@@ -8,7 +8,7 @@ export async function handleItem(data) {
     if (!data.item) { return; };
 
     const item = data.item;
-    const itemName = !data.activeEffect || game.system.id === "pf2e" || game.system.id === "ptu" ? item.name : item.label;
+    const itemName = item.name ?? item.label;
     const rinsedItemName = itemName ? AAAutorecFunctions.rinseName(itemName) : "noitem";
 
     const ammoItem = data.ammoItem;

diff --git a/src/system-handlers/workflow-data.js b/src/system-handlers/workflow-data.js
@@ -64,7 +64,7 @@ export default class AAHandler {
 
         this.item = data.ammoItem || data.item;
         this.itemUuid = this.item?.uuid || uuidv4();
-        this.itemName = !this.isActiveEffect || this.systemId === "pf2e" ? this.item.name : this.item.label;
+        this.itemName = this.item.name ?? this.item.label;
         this.rinsedName = data.rinsedName || this.itemName ? this.itemName.replace(/\s+/g, '').toLowerCase() : "";
 
         this.reachCheck = data.reach || 0;