From ac35a03e62672d0485ea78eda3a33a1c56f7982b Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Thu, 7 Jan 2021 22:37:53 +0000
Subject: [PATCH] Show web chat messages in chat history

---
 src/api.ts                          |  9 +++++----
 src/components/chat/ChatMessage.vue | 10 +++++-----
 src/dynmap.d.ts                     |  6 +++---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/api.ts b/src/api.ts
index ce31c6f..156d77e 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -445,7 +445,7 @@ function buildUpdates(data: Array<any>): DynmapUpdates {
 			}
 
 			case 'chat':
-				if(!entry.account || !entry.message || !entry.timestamp) {
+				if(!entry.message || !entry.timestamp) {
 					dropped.incomplete++;
 					continue;
 				}
@@ -455,15 +455,16 @@ function buildUpdates(data: Array<any>): DynmapUpdates {
 					continue;
 				}
 
-				if(entry.source !== 'player') {
+				if(entry.source !== 'player' && entry.source !== 'web') {
 					dropped.notImplemented++;
 					continue;
 				}
 
 				updates.chat.push({
 					type: 'chat',
-					playerAccount: entry.account,
-					playerName: entry.playerName || "",
+					source: entry.source || undefined,
+					playerAccount: entry.account || undefined,
+					playerName: entry.playerName || undefined,
 					message: entry.message || "",
 					timestamp: entry.timestamp,
 					channel: entry.channel || undefined,
diff --git a/src/components/chat/ChatMessage.vue b/src/components/chat/ChatMessage.vue
index 0118dd4..66b7eeb 100644
--- a/src/components/chat/ChatMessage.vue
+++ b/src/components/chat/ChatMessage.vue
@@ -16,7 +16,7 @@
 
 <template>
 	<li :class="`message message--${message.type}`">
-		<img v-if="facesEnabled" width="16" height="16" class="message__face" :src="image" alt="" />
+		<img v-if="showFace" width="16" height="16" class="message__face" :src="image" alt="" />
 		<span v-if="showSender" class="message__sender" v-html="message.playerName"></span>
 		<span class="message__content" v-html="messageContent"></span>
 	</li>
@@ -40,7 +40,7 @@
 		setup(props) {
 			const store = useStore();
 			let image = ref(defaultImage),
-				facesEnabled = computed(() => store.state.components.chatBox?.showPlayerFaces),
+				showFace = computed(() => store.state.components.chatBox?.showPlayerFaces && props.message.playerAccount),
 				showSender = computed(() => props.message.playerName && props.message.type === 'chat'),
 				messageContent = computed(() => {
 					switch(props.message.type) {
@@ -64,15 +64,15 @@
 				})
 
 			onMounted(() => {
-				if(store.state.components.playerMarkers && store.state.components.playerMarkers.showSkinFaces) {
-					Util.getMinecraftHead(props.message.playerAccount, '16')
+				if(showFace.value) {
+					Util.getMinecraftHead(props.message.playerAccount as string, '16')
 						.then((result) => image.value = result.src).catch(() => {});
 				}
 			});
 
 			return {
 				image,
-				facesEnabled,
+				showFace,
 				showSender,
 				messageContent
 			}
diff --git a/src/dynmap.d.ts b/src/dynmap.d.ts
index 85ddaf9..a9410e4 100644
--- a/src/dynmap.d.ts
+++ b/src/dynmap.d.ts
@@ -302,11 +302,11 @@ interface DynmapParsedUrl {
 
 interface DynmapChat {
 	type: 'chat' | 'playerjoin' | 'playerleave';
-	playerAccount: string;
-	playerName: string;
+	playerAccount?: string;
+	playerName?: string;
 	channel?: string;
 	message?: string;
-	// source?: string;
+	source?: string;
 	timestamp: number;
 }