Compat v14 : rollMode -> messageMode

system/scripts/dice/roll-n-keep-dialog.js

@@ -651,7 +651,7 @@ export class RollnKeepDialog extends FormApplication {
         if (this.roll.l5r5e.isInitiativeRoll) {
             let msgOptions = {
                 rnkRoll: this.roll,
-                rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message),
+                messageMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message),
             };
 
             await this.roll.l5r5e.actor.rollInitiative({
@@ -667,7 +667,7 @@ export class RollnKeepDialog extends FormApplication {
             // Send it to chat, switch to new message
             this.message = await this.roll.toMessage(
                 {},
-                { rollMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message) }
+                { messageMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message) }
             );
         }
 

system/scripts/dice/roll.js

@@ -327,18 +327,12 @@ export class RollL5r5e extends Roll {
      * This function can either create the ChatMessage directly, or return the data object that will be used to create.
      * @override
      */
-    async toMessage(messageData = {}, { rollMode = null } = {}) {
+    async toMessage(messageData = {}, { messageMode = null } = {}) {
         // Perform the roll, if it has not yet been rolled
         if (!this._evaluated) {
             await this.evaluate();
         }
 
-        // RollMode
-        const rMode = rollMode || messageData.rollMode || game.settings.get("core", "rollMode");
-        if (rMode) {
-            messageData = ChatMessage.applyRollMode(messageData, rMode);
-        }
-
         // Force the content to avoid weird foundry behaviour
         const content = this.l5r5e.dicesTypes.l5r ? await this.render({}) : this.total;
 
@@ -358,6 +352,12 @@ export class RollL5r5e extends Roll {
         );
         messageData.rolls = [this];
 
+        // RollMode
+        const rMode = messageMode || messageData.messageMode || game.settings.get("core", "messageMode");
+        if (rMode) {
+            messageData = ChatMessage.applyMode(messageData, rMode);
+        }
+
         // Either create the message or just return the chat data
         return ChatMessage.implementation.create(messageData, {
             rollMode: rMode,