Merge branch 'feature/chat-message-styles' of https://github.com/Foundryborne/daggerheart into feature/chat-message-styles

module/applications/dialogs/deathMove.mjs

@@ -54,6 +54,8 @@ export default class DhpDeathMove extends HandlebarsApplicationMixin(Application
                 {
                     player: this.actor.name,
                     actor: { name: this.actor.name, img: this.actor.img },
+                    author: game.users.get(game.user.id),
+                    speaker: cls.getSpeaker(),
                     title: game.i18n.localize(this.selectedMove.name),
                     img: this.selectedMove.img,
                     description: game.i18n.localize(this.selectedMove.description)

module/applications/dialogs/downtime.mjs

@@ -139,6 +139,10 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                 moves: moves,
                 actor: this.actor.uuid
             },
+            speaker: cls.getSpeaker(),
+            title: game.i18n.localize(
+                `DAGGERHEART.APPLICATIONS.Downtime.${this.shortrest ? 'shortRest' : 'longRest'}.title`
+            ),
             content: await foundry.applications.handlebars.renderTemplate(
                 'systems/daggerheart/templates/ui/chat/downtime.hbs',
                 {

module/applications/ui/chatLog.mjs

@@ -1,4 +1,4 @@
-import { emitAsGM, GMUpdateEvent } from "../../systemRegistration/socket.mjs";
+import { emitAsGM, GMUpdateEvent } from '../../systemRegistration/socket.mjs';
 
 export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLog {
     constructor(options) {
@@ -15,6 +15,11 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         this.setupHooks();
     }
 
+    /** @inheritDoc */
+    static DEFAULT_OPTIONS = {
+        classes: ['daggerheart']
+    };
+
     addChatListeners = async (app, html, data) => {
         html.querySelectorAll('.duality-action-damage').forEach(element =>
             element.addEventListener('click', event => this.onRollDamage(event, data.message))
@@ -100,22 +105,24 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         if (message.system.source.item && message.system.source.action) {
             const action = this.getAction(actor, message.system.source.item, message.system.source.action);
             if (!action || !action?.hasSave) return;
-            action.rollSave(token.actor, event, message).then(result => emitAsGM(
-                GMUpdateEvent.UpdateSaveMessage,
-                action.updateSaveMessage.bind(action, result, message, token.id),
-                {
-                    action: action.uuid,
-                    message: message._id,
-                    token: token.id,
-                    result
-                }
-            ));
+            action.rollSave(token.actor, event, message).then(result =>
+                emitAsGM(
+                    GMUpdateEvent.UpdateSaveMessage,
+                    action.updateSaveMessage.bind(action, result, message, token.id),
+                    {
+                        action: action.uuid,
+                        message: message._id,
+                        token: token.id,
+                        result
+                    }
+                )
+            );
         }
     }
 
     async onRollAllSave(event, message) {
         event.stopPropagation();
-        if(!game.user.isGM) return;
+        if (!game.user.isGM) return;
         const targets = event.target.parentElement.querySelectorAll(
             '.target-section > [data-token] .target-save-container'
         );
@@ -124,16 +131,17 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         targets.forEach(async el => {
             const tokenId = el.closest('[data-token]')?.dataset.token,
                 token = game.canvas.tokens.get(tokenId);
-            if(!token.actor) return;
-            if(game.user === token.actor.owner)
-                el.dispatchEvent(new PointerEvent('click', { shiftKey: true }));
+            if (!token.actor) return;
+            if (game.user === token.actor.owner) el.dispatchEvent(new PointerEvent('click', { shiftKey: true }));
             else {
-                token.actor.owner.query('reactionRoll', {
-                    actionId: action.uuid,
-                    actorId: token.actor.uuid,
-                    event,
-                    message
-                }).then(result => action.updateSaveMessage(result, message, token.id));
+                token.actor.owner
+                    .query('reactionRoll', {
+                        actionId: action.uuid,
+                        actorId: token.actor.uuid,
+                        event,
+                        message
+                    })
+                    .then(result => action.updateSaveMessage(result, message, token.id));
             }
         });
     }
@@ -172,7 +180,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         return {
             isHit,
             targets: isHit
-                ? message.system.targets.filter(t => t.hit === true).map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId))
+                ? message.system.targets
+                      .filter(t => t.hit === true)
+                      .map(target => game.canvas.tokens.documentCollection.find(t => t.actor.uuid === target.actorId))
                 : Array.from(game.user.targets)
         };
     }
@@ -234,10 +244,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
                 });
             }
 
-            if(message.system.hasHealing)
-                target.actor.takeHealing(damages);
-            else
-                target.actor.takeDamage(damages);
+            if (message.system.hasHealing) target.actor.takeHealing(damages);
+            else target.actor.takeDamage(damages);
         }
     }
 

module/data/fields/actionField.mjs

@@ -254,11 +254,15 @@ export function ActionMixin(Base) {
                 origin: origin,
                 action: { name: this.name, img: this.img, tags: this.tags ? this.tags : ['Spell', 'Arcana', 'Lv 10'] },
                 itemOrigin: this.item,
-                description: this.description,
+                description: this.description
             };
             const msg = {
                 type: 'abilityUse',
                 user: game.user.id,
+                actor: { name: this.actor.name, img: this.actor.img },
+                author: this.author,
+                speaker: cls.getSpeaker(),
+                title: game.i18n.localize('DAGGERHEART.UI.Chat.action.title'),
                 system: systemData,
                 content: await foundry.applications.handlebars.renderTemplate(
                     'systems/daggerheart/templates/ui/chat/action.hbs',

module/documents/chatMessage.mjs

@@ -6,8 +6,13 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 _source: this.system._source
             });
 
+        const actor = game.actors.get(this.speaker.actor);
+        const actorData = actor ?? {
+            img: this.author.avatar ? this.author.avatar : 'icons/svg/mystery-man.svg',
+            name: ''
+        };
         /* We can change to fully implementing the renderHTML function if needed, instead of augmenting it. */
-        const html = await super.renderHTML();
+        const html = await super.renderHTML({ actor: actorData, author: this.author });
         this.applyPermission(html);
 
         if (this.type === 'dualityRoll') {

module/documents/item.mjs

@@ -128,7 +128,11 @@ export default class DHItem extends foundry.documents.Item {
         const msg = new cls({
             type: 'abilityUse',
             user: game.user.id,
+            actor: this.actor,
+            author: this.author,
+            speaker: cls.getSpeaker(),
             system: systemData,
+            title: game.i18n.localize('DAGGERHEART.ACTIONS.Config.displayInChat'),
             content: await foundry.applications.handlebars.renderTemplate(
                 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
                 systemData