feat(desktop): get client messaging token

DIYgod · DIYgod · commit 2f87870bdb22 · 2025-05-21T22:23:09.000+08:00
diff --git a/apps/desktop/layer/main/src/lib/user.ts b/apps/desktop/layer/main/src/lib/user.ts
@@ -30,6 +30,7 @@ export const updateNotificationsToken = async (newCredentials?: Credentials) =>
     } catch (error) {
       logger.error("updateNotificationsToken error: ", error)
     }
+    logger.info("updateNotificationsToken success: ", credentials.fcm.token)
   }
 }
 
diff --git a/apps/desktop/layer/main/src/tipc/setting.ts b/apps/desktop/layer/main/src/tipc/setting.ts
@@ -51,4 +51,7 @@ export const settingRoute = {
     updateProxy()
     return result
   }),
+  getMessagingToken: t.procedure.action(async () => {
+    return store.get("notifications-credentials")
+  }),
 }
diff --git a/apps/desktop/layer/renderer/src/modules/action/target-action-list.tsx b/apps/desktop/layer/renderer/src/modules/action/target-action-list.tsx
@@ -21,12 +21,15 @@ import {
 } from "~/components/ui/dropdown-menu/dropdown-menu"
 import { actionActions, useActionByIndex } from "~/store/action"
 
+import { useSettingModal } from "../settings/modal/use-setting-modal"
+
 type Action = {
   title: string
   icon: React.ReactNode
   config?: () => React.ReactNode
   configInline?: boolean
   enabled: boolean
+  settingsPath?: string
   onInit: (data: ActionModel) => void
   onRemove: (data: ActionModel) => void
 }
@@ -65,6 +68,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
   const star = useActionByIndex(index, (a) => a.result.star)
   const rewriteRules = useActionByIndex(index, (a) => a.result.rewriteRules)
   const webhooks = useActionByIndex(index, (a) => a.result.webhooks)
+  const settingModalPresent = useSettingModal()
 
   const disabled = useActionByIndex(index, (a) => a.result.disabled)
   const { t } = useTranslation("settings")
@@ -77,6 +81,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
         title: t("actions.action_card.generate_summary"),
         icon: <i className="i-mgc-ai-cute-re" />,
         enabled: !!summary,
+        settingsPath: "general",
         onInit: (data) => {
           data.result.summary = true
         },
@@ -88,6 +93,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
         title: t("actions.action_card.translate_into"),
         icon: <i className="i-mgc-translate-2-ai-cute-re" />,
         enabled: !!translation,
+        settingsPath: "general",
         onInit: (data) => {
           data.result.translation = true
         },
@@ -120,6 +126,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
       {
         title: t("actions.action_card.new_entry_notification"),
         icon: <i className="i-mgc-notification-cute-re" />,
+        settingsPath: "notifications",
         enabled: !!newEntryNotification,
         onInit: (data) => {
           data.result.newEntryNotification = true
@@ -366,6 +373,18 @@ export const TargetActionList = ({ index }: { index: number }) => {
                     <div className="flex items-center gap-2">
                       {action.icon}
                       <span className="shrink grow truncate">{action.title}</span>
+                      {action.settingsPath && (
+                        <Button
+                          buttonClassName="ml-4"
+                          variant="outline"
+                          size="sm"
+                          onClick={() => {
+                            settingModalPresent(action.settingsPath)
+                          }}
+                        >
+                          {t("actions.action_card.settings")}
+                        </Button>
+                      )}
                     </div>
                     {action.configInline && action.config && action.config()}
 
diff --git a/apps/desktop/layer/renderer/src/modules/settings/tabs/notifications.tsx b/apps/desktop/layer/renderer/src/modules/settings/tabs/notifications.tsx
@@ -16,13 +16,15 @@ import {
   TooltipPortal,
   TooltipTrigger,
 } from "@follow/components/ui/tooltip/index.jsx"
+import { useEffect } from "react"
 import { Trans } from "react-i18next"
 import { Link } from "react-router"
 import { toast } from "sonner"
 
-import { useAppMessagingToken } from "~/atoms/app"
+import { setAppMessagingToken, useAppMessagingToken } from "~/atoms/app"
 import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
 import { useI18n } from "~/hooks/common"
+import { tipcClient } from "~/lib/client"
 import { useMessaging, useTestMessaging } from "~/queries/messaging"
 
 export const SettingNotifications = () => {
@@ -34,6 +36,12 @@ export const SettingNotifications = () => {
 
   const testMessaging = useTestMessaging()
 
+  useEffect(() => {
+    tipcClient?.getMessagingToken().then((credentials) => {
+      setAppMessagingToken(credentials?.fcm?.token || null)
+    })
+  }, [])
+
   return (
     <section className="mt-4">
       <div className="mb-4 space-y-2 text-sm">
diff --git a/locales/settings/en.json b/locales/settings/en.json
@@ -40,6 +40,7 @@
   "actions.action_card.operator": "Operator",
   "actions.action_card.or": "Or",
   "actions.action_card.rewrite_rules": "Rewrite rules",
+  "actions.action_card.settings": "Settings",
   "actions.action_card.silence": "Silence",
   "actions.action_card.source_content": "View source content",
   "actions.action_card.star": "Star",

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export const updateNotificationsToken = async (newCredentials?: Credentials) =>`
`30`	`30`	`} catch (error) {`
`31`	`31`	`logger.error("updateNotificationsToken error: ", error)`
`32`	`32`	`}`
	`33`	`+ logger.info("updateNotificationsToken success: ", credentials.fcm.token)`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,7 @@ export const settingRoute = {`
`51`	`51`	`updateProxy()`
`52`	`52`	`return result`
`53`	`53`	`}),`
	`54`	`+ getMessagingToken: t.procedure.action(async () => {`
	`55`	`+ return store.get("notifications-credentials")`
	`56`	`+ }),`
`54`	`57`	`}`