From 57489db59036f5224788cecadc403e70acbb23cd Mon Sep 17 00:00:00 2001
From: Spappz <34202141+Spappz@users.noreply.github.com>
Date: Thu, 30 Jan 2025 04:09:02 +0000
Subject: [PATCH] simplify ChatMessage handling + add error message

---
 lang/en.json                  |  1 +
 src/view/ChatMessage/index.ts | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index c9754c1f..93eaae25 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -44,6 +44,7 @@
 			"error": {
 				"badModuleFlags": "Failed to read package flags for module {title} (<code>{id}</code>).",
 				"badModuleAnimations": "Failed to load animation sets for {title} (<code>{id}</code>). See console (<kbd>F12</kbd>) for more information.",
+				"badMessageFlags": "Failed to read module <code>ChatMessage</code> flags (received <code>{flags}</code>).",
 				"cantAccessFile": "Can't access file `{path}`.",
 				"schemaValidationFailed": "{number} animation sets failed validation! See console (<kbd>F12</kbd>) for more information."
 			}
diff --git a/src/view/ChatMessage/index.ts b/src/view/ChatMessage/index.ts
index 6ca26bed..bee9ae2d 100644
--- a/src/view/ChatMessage/index.ts
+++ b/src/view/ChatMessage/index.ts
@@ -1,20 +1,25 @@
 import type { ChatMessagePF2e } from 'foundry-pf2e';
 import { FVTTVersion } from '#standard/fvtt';
-import { info } from '../../utils';
+import { ErrorMsg, info } from '../../utils';
 import CrosshairPicker from './CrosshairPicker.svelte';
 import TourNag from './TourNag.svelte';
 
 function assignSvelteComponent(element: HTMLElement, message: ChatMessagePF2e, component: string) {
-	if (!message.flags['pf2e-graphics']) return;
-	if (message.flags['pf2e-graphics']._svelteComponent) return;
+	const moduleFlags = message.flags['pf2e-graphics'];
+	if (!moduleFlags) return;
+	if (moduleFlags._svelteComponent) return;
 
 	if (component === 'CrosshairPicker') {
-		message.flags['pf2e-graphics']._svelteComponent = new CrosshairPicker({
+		moduleFlags._svelteComponent = new CrosshairPicker({
 			target: element,
 			props: { message },
 		});
 	} else if (component === 'TourNag') {
-		message.flags['pf2e-graphics']._svelteComponent = new TourNag({ target: element, props: { message } });
+		moduleFlags._svelteComponent = new TourNag({ target: element, props: { message } });
+	} else {
+		throw ErrorMsg.send('pf2e-graphics.load.error.badMessageFlags', {
+			flags: Object.keys(moduleFlags).join(', '),
+		});
 	}
 }