From 51e1ece5aeb801729d715663daadfef8dc138159 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Thu, 22 May 2025 12:25:37 +0800
Subject: [PATCH] fix(desktop): notification token updating

---
 apps/desktop/layer/main/src/index.ts    |  1 +
 apps/desktop/layer/main/src/init.ts     | 11 ++---------
 apps/desktop/layer/main/src/lib/user.ts |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/desktop/layer/main/src/index.ts b/apps/desktop/layer/main/src/index.ts
index 4f745acb4..2fbb25cff 100644
--- a/apps/desktop/layer/main/src/index.ts
+++ b/apps/desktop/layer/main/src/index.ts
@@ -117,6 +117,7 @@ function bootstrap() {
     updateProxy()
     registerUpdater()
     registerAppTray()
+    updateNotificationsToken()
 
     app.on("open-url", (_, url) => {
       if (mainWindow && !mainWindow.isDestroyed()) {
diff --git a/apps/desktop/layer/main/src/init.ts b/apps/desktop/layer/main/src/init.ts
index a2e8adeed..817a37124 100644
--- a/apps/desktop/layer/main/src/init.ts
+++ b/apps/desktop/layer/main/src/init.ts
@@ -18,7 +18,7 @@ import { registerAppMenu } from "./menu"
 import type { RendererHandlers } from "./renderer-handlers"
 import { initializeSentry } from "./sentry"
 import { router } from "./tipc"
-import { createMainWindow, getMainWindow } from "./window"
+import { getMainWindowOrCreate } from "./window"
 
 if (process.argv.length === 3 && process.argv[2]!.startsWith("follow-dev:")) {
   process.env.NODE_ENV = "development"
@@ -155,10 +155,6 @@ const registerPushNotifications = async () => {
   const credentials = store.get(credentialsKey)
   const persistentIds = store.get(persistentIdsKey)
 
-  if (credentials) {
-    updateNotificationsToken(credentials)
-  }
-
   const instance = new PushReceiver({
     debug: true,
     firebase: JSON.parse(env.VITE_FIREBASE_CONFIG),
@@ -190,10 +186,7 @@ const registerPushNotifications = async () => {
           body: data.description,
         })
         notification.on("click", () => {
-          let mainWindow = getMainWindow()
-          if (!mainWindow) {
-            mainWindow = createMainWindow()
-          }
+          const mainWindow = getMainWindowOrCreate()
           mainWindow.restore()
           mainWindow.focus()
           const handlers = getRendererHandlers<RendererHandlers>(mainWindow.webContents)
diff --git a/apps/desktop/layer/main/src/lib/user.ts b/apps/desktop/layer/main/src/lib/user.ts
index 532a5d303..0fb03370f 100644
--- a/apps/desktop/layer/main/src/lib/user.ts
+++ b/apps/desktop/layer/main/src/lib/user.ts
@@ -27,10 +27,10 @@ export const updateNotificationsToken = async (newCredentials?: Credentials) =>
           channel: notificationChannel,
         },
       })
+      logger.info("updateNotificationsToken success: ", credentials.fcm.token)
     } catch (error) {
       logger.error("updateNotificationsToken error: ", error)
     }
-    logger.info("updateNotificationsToken success: ", credentials.fcm.token)
   }
 }