Merge pull request dmdorman#1508 from phBalance/phBalance/v12-migrati…

…on-warnings v12 migration warnings
phBalance · Nov 23, 2024 · bb9d82b · bb9d82b
2 parents abd99a9 + bdc77d2
commit bb9d82b
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 123 deletions.
diff --git a/module/actor/actor-sheet.mjs b/module/actor/actor-sheet.mjs
@@ -703,12 +703,9 @@ export class HeroSystemActorSheet extends ActorSheet {
             item.actor?.name ||
             item.compendium?.name ||
             (item.uuid.startsWith("Item.") ? "ItemSidebar" : null);
-        // const speaker = ChatMessage.getSpeaker({ actor: actor, token });
-        // speaker.alias = actor.name;
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             whisper: [...whisperUserTargetsForActor(actor), ...whisperUserTargetsForActor(item.actor)],
-            //speaker: speaker,
         };
 
         // Delete original if equipment and it belonged to an actor (as opposed to item sidebar or compendium)?
@@ -905,7 +902,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         const chatData = {
             style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: heroRoller.rawRolls(),
-            user: game.user._id,
+            author: game.user._id,
             content: cardHtml,
             speaker: speaker,
         };
@@ -944,7 +941,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         const chatData = {
             style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: characteristicRoller.rawRolls(),
-            user: game.user._id,
+            author: game.user._id,
             content: cardHtml,
             speaker: speaker,
         };
@@ -1019,7 +1016,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         const chatData = {
             style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: characteristicRoller.rawRolls(),
-            user: game.user._id,
+            author: game.user._id,
             content: cardHtml,
             speaker: speaker,
         };
@@ -1311,7 +1308,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         const token = this.actor.token;
         const speaker = ChatMessage.getSpeaker({ actor: this.actor, token });
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: content,
             speaker: speaker,

diff --git a/module/actor/actor.mjs b/module/actor/actor.mjs
@@ -207,7 +207,7 @@ export class HeroSystem6eActor extends Actor {
 
         if (content) {
             const chatData = {
-                user: game.user.id,
+                author: game.user.id,
                 whisper: ChatMessage.getWhisperRecipients("GM"),
                 speaker: ChatMessage.getSpeaker({ actor: this }),
                 blind: true,
@@ -225,10 +225,10 @@ export class HeroSystem6eActor extends Actor {
             const token = this.getActiveTokens()[0];
             const speaker = ChatMessage.getSpeaker({ actor: this, token });
             const tokenName = token?.name || this.name;
-            speaker["alias"] = game.user.name; //game.token?.name || this.name;
+            speaker["alias"] = game.user.name;
             const content = `<b>${tokenName}</b> ${changed.system.heroicIdentity ? "entered" : "left"} their heroic identity.`;
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: content,
                 speaker: speaker,
@@ -437,7 +437,7 @@ export class HeroSystem6eActor extends Actor {
             const content = `${tokenName} <i>is holding their breath</i>.`;
             if (asAction) {
                 const chatData = {
-                    user: game.user._id,
+                    author: game.user._id,
                     style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                     content: content,
                     speaker: speaker,
@@ -486,7 +486,7 @@ export class HeroSystem6eActor extends Actor {
         }
 
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: content,
             speaker: speaker,
@@ -556,12 +556,11 @@ export class HeroSystem6eActor extends Actor {
         if (!result && overrideCanAct) {
             const speaker = ChatMessage.getSpeaker({
                 actor: this,
-                //token,
             });
             speaker["alias"] = game.user.name;
 
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: `${this.name} is ${badStatus.join(", ")} and cannot move. Override key was used.`,
                 whisper: whisperUserTargetsForActor(this),
@@ -622,7 +621,7 @@ export class HeroSystem6eActor extends Actor {
             speaker["alias"] = game.user.name;
 
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: `${this.name} is ${badStatus.join(", ")} and cannot act. Override key was used.`,
                 whisper: whisperUserTargetsForActor(this),

diff --git a/module/combat.mjs b/module/combat.mjs
@@ -553,7 +553,7 @@ export class HeroSystem6eCombat extends Combat {
                 speaker["alias"] = combatant.actor.name;
 
                 const chatData = {
-                    user: game.user._id,
+                    author: game.user._id,
                     style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                     content: content,
                     whisper: whisperUserTargetsForActor(combatant.actor),
@@ -618,7 +618,7 @@ export class HeroSystem6eCombat extends Combat {
             const content = `${combatant.actor.name} recovers from being stunned.`;
 
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: content,
             };
@@ -673,7 +673,7 @@ export class HeroSystem6eCombat extends Combat {
             This typically occurs when rewinding combat or during speed changes.</p>`;
             const chatData = {
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
-                user: game.user._id,
+                author: game.user._id,
                 content: content,
             };
 
@@ -754,7 +754,7 @@ export class HeroSystem6eCombat extends Combat {
         contentHidden += "</ul>";
         const chatData = {
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
-            user: game.user._id,
+            author: game.user._id,
             content: content,
         };
 

diff --git a/module/herosystem6e.mjs b/module/herosystem6e.mjs
@@ -676,7 +676,7 @@ Hooks.on("updateWorldTime", async (worldTime, options) => {
 
                 if (content) {
                     const chatData = {
-                        user: game.user.id, //ChatMessage.getWhisperRecipients('GM'),
+                        author: game.user.id,
                         whisper: [
                             ...ChatMessage.getWhisperRecipients(actor.name),
                             ...ChatMessage.getWhisperRecipients("GM"),

diff --git a/module/item/item-attack-application.mjs b/module/item/item-attack-application.mjs
@@ -473,7 +473,7 @@ export class ItemAttackFormApplication extends FormApplication {
 
         const templateData = {
             t: templateType,
-            user: game.user.id,
+            author: game.user.id,
             distance: distance,
             direction: -token.document?.rotation || 0 + 90, // Top down tokens typically face south
             fillColor: game.user.color,

diff --git a/module/item/item-attack.mjs b/module/item/item-attack.mjs
@@ -354,7 +354,7 @@ export async function AttackAoeToHit(item, options) {
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
         rolls: attackHeroRoller.rawRolls(),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -903,7 +903,7 @@ export async function AttackToHit(item, options) {
         speaker["alias"] = item.actor.name;
 
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: `${resourcesUsedDescription}${resourcesUsedDescriptionRenderedRoll}`,
             whisper: ChatMessage.getWhisperRecipients("GM"),
@@ -943,7 +943,7 @@ export async function AttackToHit(item, options) {
         speaker["alias"] = item.actor.name;
 
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: `${item.name} ${dcv.signedString()} DCV`,
             speaker,
@@ -1000,7 +1000,7 @@ export async function AttackToHit(item, options) {
             .flat()
             .concat(stunForEndHeroRoller?.rawRolls())
             .filter(Boolean),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -1384,7 +1384,7 @@ async function _rollApplyKnockback(token, knockbackDice) {
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
         rolls: damageRoller.rawRolls(),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -1615,7 +1615,7 @@ export async function _onRollDamage(event) {
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
         rolls: damageRoller.rawRolls(),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -1669,7 +1669,7 @@ export async function _onRollMindScan(event) {
 
     const content = await renderTemplate(template2, data);
     const chatData = {
-        user: game.user._id,
+        author: game.user._id,
         style: CONST.CHAT_MESSAGE_STYLES.OTHER,
         content,
         speaker: ChatMessage.getSpeaker({ actor: item.actor }),
@@ -1837,7 +1837,7 @@ export async function _onRollMindScanEffectRoll(event) {
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
         rolls: damageRoller.rawRolls(),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -2165,7 +2165,7 @@ export async function _onApplyDamageToSpecificToken(event, tokenId) {
             const speaker = ChatMessage.getSpeaker({ actor: token.actor });
             speaker["alias"] = token.actor.name;
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content,
                 whisper: ChatMessage.getWhisperRecipients("GM"),
@@ -2176,7 +2176,7 @@ export async function _onApplyDamageToSpecificToken(event, tokenId) {
         }
     }
 
-    // Some defenses requre a roll not just to active, but on each use.  6e EVERYPHASE.  5e ACTIVATIONROLL
+    // Some defenses require a roll not just to active, but on each use.  6e EVERYPHASE.  5e ACTIVATIONROLL
     const defenseEveryPhase = token.actor.items.filter(
         (o) =>
             (o.system.subType || o.system.type) === "defense" &&
@@ -2300,7 +2300,7 @@ export async function _onApplyDamageToSpecificToken(event, tokenId) {
             let speaker = ChatMessage.getSpeaker({ actor: item.actor });
 
             const chatData = {
-                user: game.user._id,
+                author: game.user._id,
                 content: `${item.name} did no damage.`,
                 speaker: speaker,
             };
@@ -2470,7 +2470,7 @@ export async function _onApplyDamageToSpecificToken(event, tokenId) {
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
         rolls: damageDetail.knockbackRoller?.rawRolls(),
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -2588,7 +2588,7 @@ export async function _onApplyEntangleToSpecificToken(item, token, originalRoll)
 
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -2706,7 +2706,7 @@ export async function _onApplyDamageToEntangle(attackItem, token, originalRoll,
 
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -2755,7 +2755,7 @@ async function _performAbsorptionForToken(token, absorptionItems, damageDetail,
                 const chatData = {
                     style: CONST.CHAT_MESSAGE_STYLES.OOC,
                     rolls: absorptionRoller.rawRolls(),
-                    user: game.user._id,
+                    author: game.user._id,
                     content: cardHtml,
                     speaker: speaker,
                 };
@@ -3042,7 +3042,7 @@ async function _onApplySenseAffectingToSpecificToken(senseAffectingItem, token,
     const speaker = ChatMessage.getSpeaker({ actor: senseAffectingItem.actor });
 
     const chatData = {
-        user: game.user._id,
+        author: game.user._id,
         content: cardHtml,
         speaker: speaker,
     };
@@ -3531,7 +3531,7 @@ export async function userInteractiveVerifyOptionallyPromptThenSpendResources(it
         speaker.alias = item.actor.name;
         const overrideKeyText = game.keybindings.get(HEROSYS.module, "OverrideCanAct")?.[0].key;
         const chatData = {
-            user: game.user._id,
+            author: game.user._id,
             style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: `${game.user.name} is using ${overrideKeyText} to override using ${resourcesUsedDescription} for <b>${item.name}</b>${resourcesUsedDescriptionRenderedRoll}`,
             whisper: whisperUserTargetsForActor(this),