From 6091f14a6bc7b237f21596ebe5e97c1efb74a053 Mon Sep 17 00:00:00 2001
From: an-lee <an.lee.work@gmail.com>
Date: Tue, 10 Dec 2024 06:43:15 +0800
Subject: [PATCH] fix #1234

---
 enjoy/src/main/db/models/chat.ts         | 8 +++++---
 enjoy/src/main/db/models/user-setting.ts | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/enjoy/src/main/db/models/chat.ts b/enjoy/src/main/db/models/chat.ts
index 26431c75..be098bde 100644
--- a/enjoy/src/main/db/models/chat.ts
+++ b/enjoy/src/main/db/models/chat.ts
@@ -108,15 +108,17 @@ export class Chat extends Model<Chat> {
   static async notify(chat: Chat, action: "create" | "update" | "destroy") {
     if (!mainWindow.win) return;
 
+    let chatData = { id: chat?.id };
     if (action !== "destroy") {
-      chat = await Chat.findByPk(chat.id);
+      chat = await Chat.findByPk(chat?.id);
+      chatData = chat?.toJSON() || chatData;
     }
 
     mainWindow.win.webContents.send("db-on-transaction", {
       model: "Chat",
-      id: chat.id,
+      id: chatData.id,
       action,
-      record: chat.toJSON(),
+      record: chatData,
     });
   }
 
diff --git a/enjoy/src/main/db/models/user-setting.ts b/enjoy/src/main/db/models/user-setting.ts
index 98047aa0..786a18cb 100644
--- a/enjoy/src/main/db/models/user-setting.ts
+++ b/enjoy/src/main/db/models/user-setting.ts
@@ -59,7 +59,11 @@ export class UserSetting extends Model<UserSetting> {
 
     // update i18n
     if (key === UserSettingKeyEnum.LANGUAGE) {
-      i18n.changeLanguage(value);
+      try {
+        await i18n.changeLanguage(value);
+      } catch (error) {
+        logger.error("UserSetting.set: changeLanguage failed", error);
+      }
     }
   }