From 3224d435d3f8369000c97fbca1b79f9955dfd311 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Sat, 16 Mar 2024 14:47:24 +0900
Subject: [PATCH] Fix inlay emotions displaying Object Object

---
 src/ts/parser.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ts/parser.ts b/src/ts/parser.ts
index 6efe7bac..dda0ddac 100644
--- a/src/ts/parser.ts
+++ b/src/ts/parser.ts
@@ -83,7 +83,7 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
     const db = get(DataBase)
     const assetWidthString = (db.assetWidth && db.assetWidth !== -1 || db.assetWidth === 0) ? `max-width:${db.assetWidth}rem;` : ''
 
-    if(char.additionalAssets){
+    if(char.additionalAssets || char.emotionImages){
 
         let assetPaths:{[key:string]:{
             path:string
@@ -93,11 +93,13 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
             path:string
         }} = {}
 
-        for(const asset of char.additionalAssets){
-            const assetPath = await getFileSrc(asset[1])
-            assetPaths[asset[0].toLocaleLowerCase()] = {
-                path: assetPath,
-                ext: asset[2]
+        if(char.additionalAssets){
+            for(const asset of char.additionalAssets){
+                const assetPath = await getFileSrc(asset[1])
+                assetPaths[asset[0].toLocaleLowerCase()] = {
+                    path: assetPath,
+                    ext: asset[2]
+                }
             }
         }
         if(char.emotionImages){
@@ -112,7 +114,7 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
         data = data.replaceAll(assetRegex, (full:string, type:string, name:string) => {
             name = name.toLocaleLowerCase()
             if(type === 'emotion'){
-                const path = emoPaths[name]
+                const path = emoPaths[name]?.path
                 if(!path){
                     return ''
                 }