Fix duplicate messages

module/data/action/baseAction.mjs

@@ -145,9 +145,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             if (this.rollDamage && this.damage.parts.length) await this.rollDamage(event, config);
             else if (this.trigger) await this.trigger(event, config);
             else if (this.hasSave || this.hasEffect) {
-                const roll = new Roll('');
+                const roll = new CONFIG.Dice.daggerheart.DHRoll('');
                 roll._evaluated = true;
-                if (this.hasTarget) config.targetSelection = config.targets.length > 0;
+                if(config.hasTarget) config.targetSelection = config.targets.length > 0;
                 await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
             }
         }
@@ -180,7 +180,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             hasHealing: this.damage?.parts?.length && this.type === 'healing',
             hasEffect: !!this.effects?.length,
             hasSave: this.hasSave,
-            hasTarget: true,
             selectedRollMode: game.settings.get('core', 'rollMode'),
             isFastForward: event.shiftKey,
             data: this.getRollData(),
@@ -253,8 +252,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
             )
         ) this.update({ 'uses.value': this.uses.value + 1 });
 
-        if(config.roll?.success || successCost)
-            (config.message ?? config.parent).update({'system.successConsumed': true})
+        if(config.roll?.success || successCost) {
+            setTimeout(() => {
+                (config.message ?? config.parent).update({'system.successConsumed': true})
+            }, 50);
+        }
     }
     /* */
 
@@ -375,15 +377,15 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
     async updateChatMessage(message, targetId, changes, chain = true) {
         setTimeout(async () => {
-            const chatMessage = ui.chat.collection.get(message._id),
-                msgTarget =
-                    chatMessage.system.targets.find(mt => mt.id === targetId) ??
-                    chatMessage.system.oldTargets.find(mt => mt.id === targetId);
-            msgTarget.saved = changes;
+            const chatMessage = ui.chat.collection.get(message._id);
+            
             await chatMessage.update({
-                system: {
-                    targets: chatMessage.system.targets,
-                    oldTargets: chatMessage.system.oldTargets
+                flags: {
+                    [game.system.id]: {
+                        "reactionRolls": {
+                            [targetId]: changes
+                        }
+                    }
                 }
             });
         }, 100);

module/data/chat-message/adversaryRoll.mjs

@@ -24,7 +24,6 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
             title: new fields.StringField(),
             roll: new fields.ObjectField(),
             targets: targetsField(),
-            oldTargets: targetsField(),
             targetSelection: new fields.BooleanField({ initial: false }),
             hasRoll: new fields.BooleanField({ initial: false }),
             hasDamage: new fields.BooleanField({ initial: false }),
@@ -64,26 +63,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
         return actionItem.system.actionsList?.find(a => a.id === this.source.action);
     }
 
-    // get messageTemplate() {
-    //     return 'systems/daggerheart/templates/ui/chat/roll.hbs';
-    // }
-
     get targetMode() {
         return this.targetSelection;
     }
 
     set targetMode(mode) {
         this.targetSelection = mode;
-        this.updateTargets();
         this.registerTargetHook();
-        this.parent.update(
-            {
-                system: {
-                    targetSelection: this.targetSelection,
-                    oldTargets: this.oldTargets
-                }
-            }
-        );
+        this.updateTargets();
     }
 
     get hitTargets() {
@@ -91,31 +78,23 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     }
 
     async updateTargets() {
-        this.currentTargets = this.getTargetList();
-        if(!this.targetSelection) {
-            this.currentTargets.forEach(ct => {
-                if(this.targets.find(t => t.actorId === ct.actorId)) return;
-                const indexTarget = this.oldTargets.findIndex(ot => ot.actorId === ct.actorId);
-                if(indexTarget === -1)
-                    this.oldTargets.push(ct);
-            });
-            if(this.hasSave) this.setPendingSaves();
-            // if(this.currentTargets.length) {
-                if(!this.parent._id) return;
-                const updates = await this.parent.update(
-                    {
-                        system: {
-                            oldTargets: this.oldTargets
-                        }
-                    }
-                );
-                if(!updates && ui.chat.collection.get(this.parent.id))
-                    ui.chat.updateMessage(this.parent);
-            // }
-        }
+        if(!ui.chat.collection.get(this.parent.id)) return;
+        let targets;
+        if(this.targetSelection)
+            targets = this.targets;
+        else
+            targets = Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t));
+        
+        this.parent.setFlag(game.system.id, "targets", targets);
+        await this.parent.updateSource({
+            system: {
+                targetSelection: this.targetSelection
+            }
+        });
     }
 
     registerTargetHook() {
+        if(!this.parent.isAuthor) return;
         if(this.targetSelection && this.targetHook !== null) {
             Hooks.off("targetToken", this.targetHook);
             this.targetHook = null;
@@ -127,9 +106,10 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     prepareDerivedData() {
         if(this.hasTarget) {
             this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
-            this.updateTargets();
-            this.registerTargetHook();
-            if(this.targetSelection === true) {
+            this.currentTargets = this.getTargetList();
+            this. registerTargetHook();
+            
+            if(this.targetSelection === true && this.hasRoll) {
                 this.targetShort = this.targets.reduce((a,c) => {
                     if(c.hit) a.hit += 1;
                     else a.miss += 1;
@@ -140,17 +120,21 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
         }
         
         this.canViewSecret = this.parent.speakerActor?.testUserPermission(game.user, 'OBSERVER');
+        this.canButtonApply = game.user.isGM;
     }
 
     getTargetList() {
-        return this.targetSelection !== true
-            ? Array.from(game.user.targets).map(t =>{
-                    const target = game.system.api.fields.ActionFields.TargetField.formatTarget(t),
-                        oldTarget = this.targets.find(ot => ot.actorId === target.actorId) ?? this.oldTargets.find(ot => ot.actorId === target.actorId);
-                    if(oldTarget) return oldTarget;
-                    return target;
-                })
-            : this.targets;
+        const targets = this.targetSelection && this.parent.isAuthor ? this.targets : (this.parent.getFlag(game.system.id, "targets") ?? this.targets),
+            reactionRolls = this.parent.getFlag(game.system.id, "reactionRolls");
+
+        if(reactionRolls) {
+            Object.entries(reactionRolls).forEach(([k, r]) => {
+                const target = targets.find(t => t.id === k);
+                if(target) target.saved  = r;
+            });
+        }
+
+        return targets;
     }
 
     setPendingSaves() {

module/data/fields/action/targetField.mjs

@@ -15,6 +15,7 @@ export default class TargetField extends fields.SchemaField {
 
     static prepareConfig(config) {
         if (!this.target?.type) return [];
+        config.hasTarget = true;
         let targets;
         if (this.target?.type === CONFIG.DH.GENERAL.targetTypes.self.id)
             targets = [this.actor.token ?? this.actor.prototypeToken];