From 3a29570bae848fdbd8abae40b94d54255e132bf8 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Thu, 1 Dec 2022 01:22:25 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20message=20d'exp=C3=A9rience=20invisibles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Les messages d'expérience sur mêlée/tir/lancer (à répartir)
n'étaient plus visibles
---
 module/actor.js | 18 ++++++++++++------
 module/misc.js  | 11 +++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 2a975124..6b3c214a 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -2266,13 +2266,19 @@ export class RdDActor extends Actor {
   /* -------------------------------------------- */
   async appliquerAjoutExperience(rollData, hideChatMessage = 'show') {
     if (!this.isPersonnage()) return;
-    hideChatMessage = hideChatMessage == 'hide' || (game.settings.get("core", "rollMode") != 'blindroll' && !game.user.isGM)
+    hideChatMessage = hideChatMessage == 'hide' || (Misc.isRollModeHiddenToPlayer() && !game.user.isGM)
     let xpData = await this._appliquerExperience(rollData.rolled, rollData.selectedCarac.label, rollData.competence);
-    if (xpData && !hideChatMessage) {
-      ChatMessage.create({
-        whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
-        content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData)
-      });
+    if (xpData) {
+      const content = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-actor-gain-xp.html`, xpData);
+      if (hideChatMessage) {
+        ChatUtility.blindMessageToGM({ content: content});
+      }
+      else{
+        ChatMessage.create({
+          whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
+          content: content
+        });
+      }
     }
   }
 
diff --git a/module/misc.js b/module/misc.js
index fb506356..67298074 100644
--- a/module/misc.js
+++ b/module/misc.js
@@ -120,13 +120,20 @@ export class Misc {
     return Misc.firstConnectedGM()?.id ?? game.user.id;
   }
 
+  static isRollModeHiddenToPlayer() {
+      switch (game.settings.get("core", "rollMode")) {
+        case CONST.DICE_ROLL_MODES.BLIND:
+        case CONST.DICE_ROLL_MODES.SELF: return true;
+      }
+      return false
+  }
+
   static getActiveUser(id) {
     return game.users.find(u => u.id == id && u.active);
-  }  
+  }
 
   static firstConnectedGM() {
     return game.users.filter(u => u.isGM && u.active).sort(Misc.ascending(u => u.id)).find(u => u.isGM && u.active);
-    
   }
 
   static isOwnerPlayer(actor, user=undefined) {