refactor: useWhoami from user store

Author: hyoban

apps/desktop/layer/renderer/src/atoms/user.ts

@@ -1,19 +1,6 @@
-import type { UserRole } from "@follow/constants"
-import type { AuthSession } from "@follow/shared/hono"
 import { atom } from "jotai"
 
 import { createAtomHooks } from "~/lib/jotai"
 
-export const [, , useWhoami, , whoami, setWhoami] = createAtomHooks(
-  atom<Nullable<NonNullable<AuthSession>["user"]>>(null),
-)
-
 export const [, , useLoginModalShow, useSetLoginModalShow, getLoginModalShow, setLoginModalShow] =
   createAtomHooks(atom<boolean>(false))
-
-/**
- * For public beta trial user
- */
-export const [, , useUserRole, , getUserRole, setUserRole] = createAtomHooks(
-  atom<Nullable<UserRole>>(null),
-)

apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx

@@ -8,6 +8,8 @@ import { entrySyncServices } from "@follow/store/entry/store"
 import type { EntryModel } from "@follow/store/entry/types"
 import { useFeedById } from "@follow/store/feed/hooks"
 import { useIsInbox } from "@follow/store/inbox/hooks"
+import { whoami } from "@follow/store/user/getters"
+import { useRole } from "@follow/store/user/hooks"
 import { doesTextContainHTML } from "@follow/utils/utils"
 import { useMemo } from "react"
 
@@ -21,7 +23,6 @@ import {
   useEntryIsInReadability,
 } from "~/atoms/readability"
 import { useShowSourceContent } from "~/atoms/source-content"
-import { useUserRole, whoami } from "~/atoms/user"
 import { ipcServices } from "~/lib/client"
 import { COMMAND_ID } from "~/modules/command/commands/id"
 import { getCommand, useRunCommandFn } from "~/modules/command/hooks/use-command"
@@ -178,7 +179,7 @@ export const useEntryActions = ({
   const runCmdFn = useRunCommandFn()
   const hasEntry = !!entry
 
-  const userRole = useUserRole()
+  const userRole = useRole()
 
   const shortcuts = useCommandShortcuts()
 

apps/desktop/layer/renderer/src/hooks/biz/useFeedActions.tsx

@@ -12,6 +12,7 @@ import {
   useSubscriptionsByFeedIds,
 } from "@follow/store/subscription/hooks"
 import { unreadSyncService } from "@follow/store/unread/store"
+import { whoami } from "@follow/store/user/getters"
 import { isBizId } from "@follow/utils/utils"
 import { useMutation } from "@tanstack/react-query"
 import { useMemo } from "react"
@@ -21,7 +22,6 @@ import { toast } from "sonner"
 import type { FollowMenuItem, MenuItemInput } from "~/atoms/context-menu"
 import { MenuItemSeparator, MenuItemText } from "~/atoms/context-menu"
 import { useIsInMASReview } from "~/atoms/server-configs"
-import { whoami } from "~/atoms/user"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { copyToClipboard } from "~/lib/clipboard"
 import { UrlBuilder } from "~/lib/url-builder"

apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx

@@ -5,13 +5,13 @@ import {
   useFeedSubscriptionCount,
   useListSubscriptionCount,
 } from "@follow/store/subscription/hooks"
+import { useRole } from "@follow/store/user/hooks"
 import { t } from "i18next"
 import { useCallback } from "react"
 import { withoutTrailingSlash, withTrailingSlash } from "ufo"
 import { useEventCallback } from "usehooks-ts"
 
 import { useServerConfigs } from "~/atoms/server-configs"
-import { useUserRole } from "~/atoms/user"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { CustomSafeError } from "~/errors/CustomSafeError"
 import { useActivationModal } from "~/modules/activation"
@@ -21,7 +21,7 @@ import type { ListFormDataValuesType } from "~/modules/discover/ListForm"
 import { ListForm } from "~/modules/discover/ListForm"
 
 const useCanFollowMoreInboxAndNotify = () => {
-  const role = useUserRole()
+  const role = useRole()
   const listCurrentCount = useListSubscriptionCount()
   const feedCurrentCount = useFeedSubscriptionCount()
   const presentActivationModal = useActivationModal()

apps/desktop/layer/renderer/src/initialize/sentry.ts

@@ -1,13 +1,12 @@
 import { ELECTRON_BUILD } from "@follow/shared/constants"
 import { env } from "@follow/shared/env.desktop"
+import { whoami } from "@follow/store/user/getters"
 import { appSessionTraceId } from "@follow/utils/environment"
 import { version } from "@pkg"
 import { nanoid } from "nanoid"
 import { useEffect } from "react"
 import { createRoutesFromChildren, matchRoutes, useLocation, useNavigationType } from "react-router"
 
-import { whoami } from "~/atoms/user"
-
 import { SentryConfig } from "./sentry.config"
 
 Object.defineProperty(window.Error.prototype, "traceId", {

apps/desktop/layer/renderer/src/modules/app-layout/subscription-column/MainDestopLayout.tsx

@@ -1,5 +1,6 @@
 import { RootPortal } from "@follow/components/ui/portal/index.jsx"
 import { DEV, IN_ELECTRON, PROD } from "@follow/shared/constants"
+import { useWhoami } from "@follow/store/user/hooks"
 import { preventDefault } from "@follow/utils/dom"
 import type { PropsWithChildren } from "react"
 import * as React from "react"
@@ -8,7 +9,7 @@ import { Outlet } from "react-router"
 
 import { setMainContainerElement, setRootContainerElement } from "~/atoms/dom"
 import { useUISettingKey } from "~/atoms/settings/ui"
-import { useLoginModalShow, useWhoami } from "~/atoms/user"
+import { useLoginModalShow } from "~/atoms/user"
 import { AppErrorBoundary } from "~/components/common/AppErrorBoundary"
 import { ErrorComponentType } from "~/components/errors/enum"
 import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"

apps/desktop/layer/renderer/src/modules/app-layout/subscription-column/components/NewUserGuide.tsx

@@ -1,6 +1,6 @@
+import { useWhoami } from "@follow/store/user/hooks"
 import { lazy, Suspense } from "react"
 
-import { useWhoami } from "~/atoms/user"
 import { useAuthQuery } from "~/hooks/common/useBizQuery"
 import { settings } from "~/queries/settings"
 

apps/desktop/layer/renderer/src/modules/app/EnvironmentIndicator.tsx

@@ -7,14 +7,14 @@ import {
 } from "@follow/components/ui/tooltip/index.jsx"
 import { DEV, MODE } from "@follow/shared/constants"
 import { env } from "@follow/shared/env.desktop"
+import { useRole } from "@follow/store/user/hooks"
 
-import { useUserRole } from "~/atoms/user"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 
 import { DebugRegistry } from "../debug/registry"
 
 export const EnvironmentIndicator = () => {
-  const role = useUserRole()
+  const role = useRole()
   const { present } = useModalStack()
   return (
     <Tooltip>

apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx

@@ -6,6 +6,7 @@ import { collectionSyncService } from "@follow/store/collection/store"
 import { getEntry } from "@follow/store/entry/getter"
 import { entrySyncServices } from "@follow/store/entry/store"
 import { unreadSyncService } from "@follow/store/unread/store"
+import { useRole } from "@follow/store/user/hooks"
 import { cn, resolveUrlWithBase } from "@follow/utils/utils"
 import { useMutation } from "@tanstack/react-query"
 import { useTranslation } from "react-i18next"
@@ -22,7 +23,6 @@ import {
   toggleShowSourceContent,
   useSourceContentModal,
 } from "~/atoms/source-content"
-import { useUserRole } from "~/atoms/user"
 import { SharePanel } from "~/components/common/SharePanel"
 import { toggleEntryReadability } from "~/hooks/biz/useEntryActions"
 import { navigateEntry } from "~/hooks/biz/useNavigateEntry"
@@ -109,7 +109,7 @@ export const useRegisterEntryCommands = () => {
   const read = useRead()
   const unread = useUnread()
 
-  const role = useUserRole()
+  const role = useRole()
   const presentActivationModal = useActivationModal()
 
   const voice = useGeneralSettingKey("voice")

apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx

@@ -1,10 +1,10 @@
 import { Button } from "@follow/components/ui/button/index.js"
 import { UserRole } from "@follow/constants"
+import { useRole } from "@follow/store/user/hooks"
 import { repository } from "@pkg"
 import { useTranslation } from "react-i18next"
 import { useEventCallback } from "usehooks-ts"
 
-import { useUserRole } from "~/atoms/user"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { CustomSafeError } from "~/errors/CustomSafeError"
 
@@ -13,7 +13,7 @@ import { InboxTable } from "./Inbox"
 import { InboxForm } from "./InboxForm"
 
 const useCanCreateMoreInboxAndNotify = () => {
-  const role = useUserRole()
+  const role = useRole()
   const presentActivationModal = useActivationModal()
 
   return useEventCallback(() => {