Fix warnings / error due to foundry update

Gnome-Archiviste · Mar 16, 2024 · 71274ea · 71274ea
1 parent e2a9dc0
commit 71274ea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/src/app/foundry/foundry-chat.service.ts b/src/app/foundry/foundry-chat.service.ts
@@ -15,23 +15,33 @@ export class FoundryChatService extends ChatService {
     }
 
     async sendLvl0MessageFrom(actorId: string | undefined, lvl0ChatMessage: Lvl0ChatMessage, rolls?: IRoll[]): Promise<void> {
-        let messageData: MessageData<any> = {};
+        let messageData: MessageData<any> = {
+            user: game.user,
+            type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+        };
         const speaker = actorId ? ChatMessage.getSpeaker({actor: this.foundryLvl0IdResolver.getActorFromLvl0Id(actorId)}) : undefined;
+        let roll = this.mergeRolls(rolls);
+        if (roll) {
+            messageData.type = CONST.CHAT_MESSAGE_TYPES.ROLL
+            messageData.roll = roll;
+            messageData.sound = CONFIG.sounds.dice;
+        }
         await ChatMessage.create({
-            ...messageData,
-            type: rolls ? CONST.CHAT_MESSAGE_TYPES.ROLL : CONST.CHAT_MESSAGE_TYPES.OTHER,
-            speaker, content: '', flags: {
+            speaker,
+            content: '',
+            flags: {
                 'lvl0mf-sheet': {
                     lvl0ChatMessage: lvl0ChatMessage
                 }
             },
-            roll: this.mergeRolls(rolls)
-        });
+        } as MessageData<any>);
     }
 
     mergeRolls(rolls?: IRoll[]): Roll | undefined {
         if (!rolls)
             return undefined;
+        if (rolls.length === 0)
+            return undefined;
 
         let foundryRolls = rolls.filter(x => x instanceof FoundryRoll).map(x => (<FoundryRoll>x).foundryRoll)
 

diff --git a/src/app/foundry/foundry-speciality.service.ts b/src/app/foundry/foundry-speciality.service.ts
@@ -45,10 +45,10 @@ export class FoundrySpecialityService extends SpecialityService {
     async addSpeciality(characterId: string, specialityId: string): Promise<void> {
         let actor = this.foundryLvl0IdResolver.getActorFromLvl0Id(characterId);
         if (actor) {
-            if (actor.data.type === 'character') {
-                let specialities = actor.data.data.specialities || {};
+            if (actor.type === 'character') {
+                let specialities = actor.system.specialities || {};
                 let nextId = (Object.keys(specialities).reduce((previousValue, currentValue) => Math.max(previousValue, +currentValue), 0) + 1) || 1;
-                await actor.update({data: {specialities: {[nextId]: specialityId}}}, {diff: true});
+                await actor.update({system: {specialities: {[nextId]: specialityId}}}, {diff: true});
             }
         }
     }

diff --git a/src/models/actor/lvl0-foundry-actor.ts b/src/models/actor/lvl0-foundry-actor.ts
@@ -1,10 +1,12 @@
-import { InitializedGame } from '../misc/game';
+import {InitializedGame} from '../misc/game';
 import {
     ActorDataConstructorData
 } from '@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/data.mjs/actorData';
+import {Lvl0CharacterData} from '../../app/data-accessor/models/lvl0-character';
 
 export class Lvl0FoundryActor extends Actor {
     private readonly game: InitializedGame;
+    system: Lvl0CharacterData;
 
     constructor(
         data: ActorDataConstructorData,