feat: hide power

DIYgod · DIYgod · commit 165c9eb2790b · 2025-04-24T21:07:53.000+08:00
diff --git a/apps/desktop/src/renderer/src/atoms/server-configs.ts b/apps/desktop/src/renderer/src/atoms/server-configs.ts
@@ -1,14 +1,18 @@
 import type { ServerConfigs } from "@follow/models/types"
+import PKG from "@pkg"
 import { atom } from "jotai"
 
 import { createAtomHooks } from "~/lib/jotai"
-import { isInMAS } from "~/lib/utils"
 
 export const [, , useServerConfigs, , getServerConfigs, setServerConfigs] = createAtomHooks(
   atom<Nullable<ServerConfigs>>(null),
 )
 
 export const useIsInMASReview = () => {
   const serverConfigs = useServerConfigs()
-  return isInMAS() && serverConfigs?.MAS_IN_REVIEW
+  return (
+    typeof process !== "undefined" &&
+    process.mas &&
+    serverConfigs?.MAS_IN_REVIEW_VERSION === PKG.version
+  )
 }
diff --git a/apps/desktop/src/renderer/src/lib/api-fetch.ts b/apps/desktop/src/renderer/src/lib/api-fetch.ts
@@ -12,8 +12,6 @@ import { setLoginModalShow } from "~/atoms/user"
 import { NeedActivationToast } from "~/modules/activation/NeedActivationToast"
 import { DebugRegistry } from "~/modules/debug/registry"
 
-import { isInMAS } from "./utils"
-
 export const apiFetch = ofetch.create({
   baseURL: env.VITE_API_URL,
   credentials: "include",
@@ -26,9 +24,6 @@ export const apiFetch = ofetch.create({
       header.set("X-App-Dev", "1")
     }
     header.set("X-App-Name", "Folo Web")
-    if (isInMAS()) {
-      header.set("X-MAS", "1")
-    }
     options.headers = header
   },
   onResponse() {
diff --git a/apps/desktop/src/renderer/src/lib/utils.ts b/apps/desktop/src/renderer/src/lib/utils.ts
@@ -104,7 +104,3 @@ export const getBlockchainExplorerUrl = () => {
     return `https://scan.rss3.io`
   }
 }
-
-export const isInMAS = () => {
-  return typeof process !== "undefined" && process.mas
-}
diff --git a/apps/desktop/src/renderer/src/modules/discover/form.tsx b/apps/desktop/src/renderer/src/modules/discover/form.tsx
@@ -25,6 +25,7 @@ import { useForm } from "react-hook-form"
 import { useTranslation } from "react-i18next"
 import { z } from "zod"
 
+import { useIsInMASReview } from "~/atoms/server-configs"
 import { smoothPreset } from "~/components/ui/constants/spring"
 import { Media } from "~/components/ui/media"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
@@ -103,16 +104,20 @@ export function DiscoverForm({ type = "search" }: { type?: string }) {
     },
   })
   const { t } = useTranslation()
+  const isInMASReview = useIsInMASReview()
 
   const jotaiStore = useStore()
   const mutation = useMutation({
     mutationFn: async ({ keyword, target }: { keyword: string; target: "feeds" | "lists" }) => {
-      const { data } = await apiClient.discover.$post({
+      let { data } = await apiClient.discover.$post({
         json: {
           keyword: keyword.trim(),
           target,
         },
       })
+      if (isInMASReview) {
+        data = data.filter((item) => !item.list?.fee)
+      }
 
       jotaiStore.set(discoverSearchDataAtom, data)
 
diff --git a/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx b/apps/desktop/src/renderer/src/modules/new-user-guide/guide-modal-content.tsx
@@ -9,6 +9,7 @@ import { createElement, useCallback, useEffect, useMemo, useState } from "react"
 import { Trans, useTranslation } from "react-i18next"
 
 import RSSHubIconUrl from "~/assets/rsshub-icon.png?url"
+import { useIsInMASReview } from "~/atoms/server-configs"
 import { useGeneralSettingKey } from "~/atoms/settings/general"
 import { mountLottie } from "~/components/ui/lottie-container"
 import { Markdown } from "~/components/ui/markdown/Markdown"
@@ -78,6 +79,7 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) {
   const [direction, setDirection] = useState(1)
   const lang = useGeneralSettingKey("language")
   const defaultLang = ["zh-CN", "zh-HK", "zh-TW"].includes(lang ?? "") ? "zh-CN" : "en"
+  const isInMASReview = useIsInMASReview()
 
   const guideSteps = useMemo(
     () =>
@@ -92,17 +94,23 @@ export function GuideModalContent({ onClose }: { onClose: () => void }) {
           ),
           icon: "i-mgc-user-setting-cute-re",
         },
-        {
-          title: t.app("new_user_guide.step.activation.title"),
-          description: t.app("new_user_guide.step.activation.description"),
-          content: <ActivationModalContent className="w-full max-w-[500px]" hideDescription />,
-          icon: "i-mgc-love-cute-re",
-        },
-        {
-          title: t.app("new_user_guide.step.migrate.wallet"),
-          content: <MyWalletSection className="w-full max-w-[600px]" />,
-          icon: <i className="i-mgc-power text-accent" />,
-        },
+        ...(!isInMASReview
+          ? [
+              {
+                title: t.app("new_user_guide.step.activation.title"),
+                description: t.app("new_user_guide.step.activation.description"),
+                content: (
+                  <ActivationModalContent className="w-full max-w-[500px]" hideDescription />
+                ),
+                icon: "i-mgc-love-cute-re",
+              },
+              {
+                title: t.app("new_user_guide.step.migrate.wallet"),
+                content: <MyWalletSection className="w-full max-w-[600px]" />,
+                icon: <i className="i-mgc-power text-accent" />,
+              },
+            ]
+          : []),
         {
           title: t.app("new_user_guide.step.behavior.unread_question.content"),
           description: t.app("new_user_guide.step.behavior.unread_question.description"),
diff --git a/apps/desktop/src/renderer/src/modules/settings/hooks/use-setting-ctx.ts b/apps/desktop/src/renderer/src/modules/settings/hooks/use-setting-ctx.ts
@@ -1,13 +1,15 @@
 import { useMemo } from "react"
 
+import { useIsInMASReview } from "~/atoms/server-configs"
 import { useUserRole } from "~/atoms/user"
 
 import { getMemoizedSettings } from "../settings-glob"
 import type { SettingPageContext } from "../utils"
 
 export const useSettingPageContext = (): SettingPageContext => {
   const role = useUserRole()
-  return useMemo(() => ({ role }), [role])
+  const isInMASReview = useIsInMASReview()
+  return useMemo(() => ({ role, isInMASReview }), [role, isInMASReview])
 }
 
 export const useAvailableSettings = () => {
diff --git a/apps/desktop/src/renderer/src/modules/settings/utils.ts b/apps/desktop/src/renderer/src/modules/settings/utils.ts
@@ -2,6 +2,7 @@ import type { UserRole } from "@follow/constants"
 
 export interface SettingPageContext {
   role: Nullable<UserRole>
+  isInMASReview: boolean
 }
 
 export enum DisableWhy {
diff --git a/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx b/apps/desktop/src/renderer/src/modules/user/ProfileButton.electron.tsx
@@ -168,15 +168,17 @@ export const ProfileButton: FC<ProfileButtonProps> = memo((props) => {
         >
           {t("words.actions")}
         </DropdownMenuItem>
-        <DropdownMenuItem
-          className="pl-3"
-          onClick={() => {
-            navigate("/rsshub")
-          }}
-          icon={<img src={rsshubLogo} className="size-3 grayscale" />}
-        >
-          {t("words.rsshub")}
-        </DropdownMenuItem>
+        {!isInMASReview && (
+          <DropdownMenuItem
+            className="pl-3"
+            onClick={() => {
+              navigate("/rsshub")
+            }}
+            icon={<img src={rsshubLogo} className="size-3 grayscale" />}
+          >
+            {t("words.rsshub")}
+          </DropdownMenuItem>
+        )}
 
         <DropdownMenuSeparator />
         <DropdownMenuItem
diff --git a/apps/desktop/src/renderer/src/pages/settings/(settings)/feeds.tsx b/apps/desktop/src/renderer/src/pages/settings/(settings)/feeds.tsx
@@ -9,6 +9,7 @@ export const loader = defineSettingPageData({
   icon: iconName,
   name: "titles.feeds",
   priority,
+  hideIf: (ctx) => ctx.isInMASReview,
 })
 
 export function Component() {
diff --git a/apps/desktop/src/renderer/src/pages/settings/(settings)/invitations.tsx b/apps/desktop/src/renderer/src/pages/settings/(settings)/invitations.tsx
@@ -12,6 +12,7 @@ export const loader = defineSettingPageData({
   name: "titles.invitations",
   priority,
   disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation],
+  hideIf: (ctx) => ctx.isInMASReview,
 })
 
 export function Component() {
diff --git a/apps/desktop/src/renderer/src/pages/settings/(settings)/list.tsx b/apps/desktop/src/renderer/src/pages/settings/(settings)/list.tsx
@@ -12,6 +12,7 @@ export const loader = defineSettingPageData({
   name: "titles.lists",
   priority,
   disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation],
+  hideIf: (ctx) => ctx.isInMASReview,
 })
 
 export function Component() {
diff --git a/apps/desktop/src/renderer/src/pages/settings/(settings)/profile.tsx b/apps/desktop/src/renderer/src/pages/settings/(settings)/profile.tsx
@@ -2,8 +2,8 @@ import { Button } from "@follow/components/ui/button/index.js"
 import { Divider } from "@follow/components/ui/divider/Divider.js"
 import { Label } from "@follow/components/ui/label/index.js"
 
+import { useIsInMASReview } from "~/atoms/server-configs"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
-import { isInMAS } from "~/lib/utils"
 import { AccountManagement } from "~/modules/profile/account-management"
 import { EmailManagement } from "~/modules/profile/email-management"
 import { ProfileSettingForm } from "~/modules/profile/profile-setting-form"
@@ -23,6 +23,7 @@ export const loader = defineSettingPageData({
 
 export function Component() {
   const { present } = useModalStack()
+  const isInMASReview = useIsInMASReview()
   return (
     <>
       <SettingsTitle />
@@ -37,7 +38,7 @@ export function Component() {
           <UpdatePasswordForm />
           <TwoFactor />
           {/* TODO: Temporary fake account deletion feature */}
-          {isInMAS() && (
+          {isInMASReview && (
             <div className="flex items-center justify-between">
               <Label>Delete Account</Label>
               <Button
diff --git a/apps/desktop/src/renderer/src/queries/users.ts b/apps/desktop/src/renderer/src/queries/users.ts
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query"
 
+import { useIsInMASReview } from "~/atoms/server-configs"
 import { apiClient } from "~/lib/api-fetch"
 import { getProviders } from "~/lib/auth"
 import { defineQuery } from "~/lib/defineQuery"
-import { isInMAS } from "~/lib/utils"
 
 export const users = {
   profile: ({ userId }: { userId: string }) =>
@@ -22,13 +22,15 @@ export interface AuthProvider {
   icon: string
 }
 export const useAuthProviders = () => {
+  const isInMASReview = useIsInMASReview()
   return useQuery({
-    queryKey: ["providers"],
-    queryFn: async () =>
-      (
-        await getProviders(undefined, {
-          headers: isInMAS() ? { "X-MAS": "1" } : undefined,
-        })
-      ).data as Record<string, AuthProvider>,
+    queryKey: ["providers", isInMASReview],
+    queryFn: async () => {
+      if (isInMASReview) {
+        return {}
+      } else {
+        return (await getProviders()).data as Record<string, AuthProvider>
+      }
+    },
   })
 }
diff --git a/packages/shared/src/hono.ts b/packages/shared/src/hono.ts

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,3 @@ export const getBlockchainExplorerUrl = () => {`
`104`	`104`	return `https://scan.rss3.io`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-`
`108`		`-export const isInMAS = () => {`
`109`		`- return typeof process !== "undefined" && process.mas`
`110`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import type { UserRole } from "@follow/constants"`
`2`	`2`
`3`	`3`	`export interface SettingPageContext {`
`4`	`4`	`role: Nullable<UserRole>`
	`5`	`+ isInMASReview: boolean`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`export enum DisableWhy {`