(
deps = noop,
): T =>
useReadonlyRouteSelector((route) => {
- const { params } = route
+ const { params, searchParams } = route
- return selector(parseRouteParams(params))
+ return selector(parseRouteParams(params, searchParams))
}, deps)
export const getRouteParams = () => {
const route = getReadonlyRoute()
- const { params } = route
- return parseRouteParams(params)
+ const { params, searchParams } = route
+ return parseRouteParams(params, searchParams)
}
diff --git a/apps/desktop/src/renderer/src/hooks/biz/useSubscriptionActions.tsx b/apps/desktop/layer/renderer/src/hooks/biz/useSubscriptionActions.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/biz/useSubscriptionActions.tsx
rename to apps/desktop/layer/renderer/src/hooks/biz/useSubscriptionActions.tsx
diff --git a/apps/desktop/src/renderer/src/hooks/biz/useTimelineList.ts b/apps/desktop/layer/renderer/src/hooks/biz/useTimelineList.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/biz/useTimelineList.ts
rename to apps/desktop/layer/renderer/src/hooks/biz/useTimelineList.ts
diff --git a/apps/desktop/src/renderer/src/hooks/biz/useTraySetting.ts b/apps/desktop/layer/renderer/src/hooks/biz/useTraySetting.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/biz/useTraySetting.ts
rename to apps/desktop/layer/renderer/src/hooks/biz/useTraySetting.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/index.ts b/apps/desktop/layer/renderer/src/hooks/common/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/index.ts
rename to apps/desktop/layer/renderer/src/hooks/common/index.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/useBizQuery.ts b/apps/desktop/layer/renderer/src/hooks/common/useBizQuery.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useBizQuery.ts
rename to apps/desktop/layer/renderer/src/hooks/common/useBizQuery.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/useContextMenu.tsx b/apps/desktop/layer/renderer/src/hooks/common/useContextMenu.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useContextMenu.tsx
rename to apps/desktop/layer/renderer/src/hooks/common/useContextMenu.tsx
diff --git a/apps/desktop/src/renderer/src/hooks/common/useFeedSafeUrl.ts b/apps/desktop/layer/renderer/src/hooks/common/useFeedSafeUrl.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useFeedSafeUrl.ts
rename to apps/desktop/layer/renderer/src/hooks/common/useFeedSafeUrl.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/useI18n.ts b/apps/desktop/layer/renderer/src/hooks/common/useI18n.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useI18n.ts
rename to apps/desktop/layer/renderer/src/hooks/common/useI18n.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/usePreventOverscrollBounce.ts b/apps/desktop/layer/renderer/src/hooks/common/usePreventOverscrollBounce.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/usePreventOverscrollBounce.ts
rename to apps/desktop/layer/renderer/src/hooks/common/usePreventOverscrollBounce.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/useSwitchHotkeyScope.ts b/apps/desktop/layer/renderer/src/hooks/common/useSwitchHotkeyScope.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useSwitchHotkeyScope.ts
rename to apps/desktop/layer/renderer/src/hooks/common/useSwitchHotkeyScope.ts
diff --git a/apps/desktop/src/renderer/src/hooks/common/useSyncTheme.ts b/apps/desktop/layer/renderer/src/hooks/common/useSyncTheme.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/hooks/common/useSyncTheme.ts
rename to apps/desktop/layer/renderer/src/hooks/common/useSyncTheme.ts
diff --git a/apps/desktop/src/renderer/src/i18n.ts b/apps/desktop/layer/renderer/src/i18n.ts
similarity index 95%
rename from apps/desktop/src/renderer/src/i18n.ts
rename to apps/desktop/layer/renderer/src/i18n.ts
index c345a3fa0..3f9301fea 100644
--- a/apps/desktop/src/renderer/src/i18n.ts
+++ b/apps/desktop/layer/renderer/src/i18n.ts
@@ -58,7 +58,10 @@ export const initI18n = async () => {
await i18next.use(initReactI18next).init({
ns,
lng: cache ? lang : fallbackLanguage,
- fallbackLng: fallbackLanguage,
+ fallbackLng: {
+ default: [fallbackLanguage],
+ "zh-TW": ["zh-CN", fallbackLanguage],
+ },
defaultNS,
debug: import.meta.env.DEV,
diff --git a/apps/desktop/src/renderer/src/initialize/analytics.ts b/apps/desktop/layer/renderer/src/initialize/analytics.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/analytics.ts
rename to apps/desktop/layer/renderer/src/initialize/analytics.ts
diff --git a/apps/desktop/src/renderer/src/initialize/global-shortcuts.ts b/apps/desktop/layer/renderer/src/initialize/global-shortcuts.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/global-shortcuts.ts
rename to apps/desktop/layer/renderer/src/initialize/global-shortcuts.ts
diff --git a/apps/desktop/src/renderer/src/initialize/helper.ts b/apps/desktop/layer/renderer/src/initialize/helper.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/helper.ts
rename to apps/desktop/layer/renderer/src/initialize/helper.ts
diff --git a/apps/desktop/src/renderer/src/initialize/history.ts b/apps/desktop/layer/renderer/src/initialize/history.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/history.ts
rename to apps/desktop/layer/renderer/src/initialize/history.ts
diff --git a/apps/desktop/src/renderer/src/initialize/hydrate.ts b/apps/desktop/layer/renderer/src/initialize/hydrate.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/hydrate.ts
rename to apps/desktop/layer/renderer/src/initialize/hydrate.ts
diff --git a/apps/desktop/src/renderer/src/initialize/index.ts b/apps/desktop/layer/renderer/src/initialize/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/index.ts
rename to apps/desktop/layer/renderer/src/initialize/index.ts
diff --git a/apps/desktop/src/renderer/src/initialize/migrates/helper.ts b/apps/desktop/layer/renderer/src/initialize/migrates/helper.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/migrates/helper.ts
rename to apps/desktop/layer/renderer/src/initialize/migrates/helper.ts
diff --git a/apps/desktop/src/renderer/src/initialize/migrates/index.ts b/apps/desktop/layer/renderer/src/initialize/migrates/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/migrates/index.ts
rename to apps/desktop/layer/renderer/src/initialize/migrates/index.ts
diff --git a/apps/desktop/src/renderer/src/initialize/migrates/v/v1.ts b/apps/desktop/layer/renderer/src/initialize/migrates/v/v1.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/migrates/v/v1.ts
rename to apps/desktop/layer/renderer/src/initialize/migrates/v/v1.ts
diff --git a/apps/desktop/src/renderer/src/initialize/op.ts b/apps/desktop/layer/renderer/src/initialize/op.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/op.ts
rename to apps/desktop/layer/renderer/src/initialize/op.ts
diff --git a/apps/desktop/src/renderer/src/initialize/queue.ts b/apps/desktop/layer/renderer/src/initialize/queue.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/queue.ts
rename to apps/desktop/layer/renderer/src/initialize/queue.ts
diff --git a/apps/desktop/src/renderer/src/initialize/sentry.config.ts b/apps/desktop/layer/renderer/src/initialize/sentry.config.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/sentry.config.ts
rename to apps/desktop/layer/renderer/src/initialize/sentry.config.ts
diff --git a/apps/desktop/src/renderer/src/initialize/sentry.ts b/apps/desktop/layer/renderer/src/initialize/sentry.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/initialize/sentry.ts
rename to apps/desktop/layer/renderer/src/initialize/sentry.ts
diff --git a/apps/desktop/src/renderer/src/lib/__tests__/parse-html.test.ts b/apps/desktop/layer/renderer/src/lib/__tests__/parse-html.test.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/__tests__/parse-html.test.ts
rename to apps/desktop/layer/renderer/src/lib/__tests__/parse-html.test.ts
diff --git a/apps/desktop/src/renderer/src/lib/api-fetch.ts b/apps/desktop/layer/renderer/src/lib/api-fetch.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/api-fetch.ts
rename to apps/desktop/layer/renderer/src/lib/api-fetch.ts
diff --git a/apps/desktop/src/renderer/src/lib/app.ts b/apps/desktop/layer/renderer/src/lib/app.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/app.ts
rename to apps/desktop/layer/renderer/src/lib/app.ts
diff --git a/apps/desktop/src/renderer/src/lib/auth.ts b/apps/desktop/layer/renderer/src/lib/auth.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/auth.ts
rename to apps/desktop/layer/renderer/src/lib/auth.ts
diff --git a/apps/desktop/src/renderer/src/lib/client.ts b/apps/desktop/layer/renderer/src/lib/client.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/client.ts
rename to apps/desktop/layer/renderer/src/lib/client.ts
diff --git a/apps/desktop/src/renderer/src/lib/defineQuery.ts b/apps/desktop/layer/renderer/src/lib/defineQuery.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/defineQuery.ts
rename to apps/desktop/layer/renderer/src/lib/defineQuery.ts
diff --git a/apps/desktop/src/renderer/src/lib/dev.tsx b/apps/desktop/layer/renderer/src/lib/dev.tsx
similarity index 94%
rename from apps/desktop/src/renderer/src/lib/dev.tsx
rename to apps/desktop/layer/renderer/src/lib/dev.tsx
index 945edd101..2ef47a45d 100644
--- a/apps/desktop/src/renderer/src/lib/dev.tsx
+++ b/apps/desktop/layer/renderer/src/lib/dev.tsx
@@ -37,7 +37,7 @@ export const attachOpenInEditor = (stack: string) => {
{line}
diff --git a/apps/desktop/src/renderer/src/lib/error-parser.ts b/apps/desktop/layer/renderer/src/lib/error-parser.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/error-parser.ts
rename to apps/desktop/layer/renderer/src/lib/error-parser.ts
diff --git a/apps/desktop/src/renderer/src/lib/img-proxy.ts b/apps/desktop/layer/renderer/src/lib/img-proxy.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/img-proxy.ts
rename to apps/desktop/layer/renderer/src/lib/img-proxy.ts
diff --git a/apps/desktop/src/renderer/src/lib/issues.ts b/apps/desktop/layer/renderer/src/lib/issues.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/issues.ts
rename to apps/desktop/layer/renderer/src/lib/issues.ts
diff --git a/apps/desktop/src/renderer/src/lib/jotai.ts b/apps/desktop/layer/renderer/src/lib/jotai.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/jotai.ts
rename to apps/desktop/layer/renderer/src/lib/jotai.ts
diff --git a/apps/desktop/src/renderer/src/lib/load-language.ts b/apps/desktop/layer/renderer/src/lib/load-language.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/load-language.ts
rename to apps/desktop/layer/renderer/src/lib/load-language.ts
diff --git a/apps/desktop/src/renderer/src/lib/log.ts b/apps/desktop/layer/renderer/src/lib/log.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/log.ts
rename to apps/desktop/layer/renderer/src/lib/log.ts
diff --git a/apps/desktop/src/renderer/src/lib/native-menu.ts b/apps/desktop/layer/renderer/src/lib/native-menu.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/native-menu.ts
rename to apps/desktop/layer/renderer/src/lib/native-menu.ts
diff --git a/apps/desktop/src/renderer/src/lib/observe-resize.ts b/apps/desktop/layer/renderer/src/lib/observe-resize.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/observe-resize.ts
rename to apps/desktop/layer/renderer/src/lib/observe-resize.ts
diff --git a/apps/desktop/src/renderer/src/lib/parse-html.ts b/apps/desktop/layer/renderer/src/lib/parse-html.ts
similarity index 92%
rename from apps/desktop/src/renderer/src/lib/parse-html.ts
rename to apps/desktop/layer/renderer/src/lib/parse-html.ts
index 610e9e65b..a830c8a02 100644
--- a/apps/desktop/src/renderer/src/lib/parse-html.ts
+++ b/apps/desktop/layer/renderer/src/lib/parse-html.ts
@@ -39,27 +39,27 @@ export const parseHtml = (
},
img: Img,
- h1: (props) => {
+ h1: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(1)(props)
},
- h2: (props) => {
+ h2: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(2)(props)
},
- h3: (props) => {
+ h3: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(3)(props)
},
- h4: (props) => {
+ h4: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(4)(props)
},
- h5: (props) => {
+ h5: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(5)(props)
},
- h6: (props) => {
+ h6: ({ ref, ...props }) => {
markInlineImage(props.node)
return createHeadingRenderer(6)(props)
},
@@ -67,7 +67,7 @@ export const parseHtml = (
video: ({ node, ...props }) =>
createElement(Media, { ...props, popper: true, type: "video" }),
- p: ({ node, ...props }) => {
+ p: ({ node, ref, ...props }) => {
if (node?.children && node.children.length !== 1) {
for (const item of node.children) {
item.type === "element" &&
@@ -98,6 +98,7 @@ export const parseHtml = (
}),
input: ({ node, ...props }) => {
if (props.type === "checkbox") {
+ // @ts-expect-error
return createElement(Checkbox, {
...props,
disabled: false,
@@ -146,10 +147,14 @@ export const parseHtml = (
}
if (!codeString) return createElement("pre", props, props.children)
+ // Workaround for Hugo's code block
+ // Code line number in Hugo will render inside tag
+ const isLineNumberInHugo = codeString.slice(0, 15).split(" ").join("").startsWith("1\n2\n3")
return createElement(ShikiHighLighter, {
code: codeString.trimEnd(),
language: language.toLowerCase(),
+ showCopy: !isLineNumberInHugo,
})
},
figure: ({ node, ...props }) =>
@@ -172,6 +177,9 @@ export const parseHtml = (
className: tw`w-full my-0`,
}),
),
+ td: ({ node, ...props }) =>
+ // Workaround for Hugo's table code
+ createElement("td", { ...props, className: tw`p-0` }, props.children),
},
})
}
diff --git a/apps/desktop/src/renderer/src/lib/parse-markdown.ts b/apps/desktop/layer/renderer/src/lib/parse-markdown.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/parse-markdown.ts
rename to apps/desktop/layer/renderer/src/lib/parse-markdown.ts
diff --git a/apps/desktop/src/renderer/src/lib/parsers.ts b/apps/desktop/layer/renderer/src/lib/parsers.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/parsers.ts
rename to apps/desktop/layer/renderer/src/lib/parsers.ts
diff --git a/apps/desktop/src/renderer/src/lib/query-client.ts b/apps/desktop/layer/renderer/src/lib/query-client.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/query-client.ts
rename to apps/desktop/layer/renderer/src/lib/query-client.ts
diff --git a/apps/desktop/src/renderer/src/lib/translate.ts b/apps/desktop/layer/renderer/src/lib/translate.ts
similarity index 77%
rename from apps/desktop/src/renderer/src/lib/translate.ts
rename to apps/desktop/layer/renderer/src/lib/translate.ts
index 58786b64c..2f7f06763 100644
--- a/apps/desktop/src/renderer/src/lib/translate.ts
+++ b/apps/desktop/layer/renderer/src/lib/translate.ts
@@ -2,6 +2,7 @@ import { parseHtml } from "@follow/components/ui/markdown/parse-html.js"
import { views } from "@follow/constants"
import type { SupportedActionLanguage } from "@follow/shared"
import { ACTION_LANGUAGE_MAP } from "@follow/shared"
+import { duplicateIfLengthLessThan } from "@follow/utils/utils"
import { franc } from "franc-min"
import { getReadabilityContent } from "~/atoms/readability"
@@ -9,10 +10,6 @@ import type { FlatEntryModel } from "~/store/entry"
import { apiClient } from "./api-fetch"
-function duplicateIfLengthLessThan(text: string, length: number) {
- return text.length < length ? text.repeat(Math.ceil(length / text.length)) : text
-}
-
export const checkLanguage = ({
content,
language,
@@ -57,12 +54,12 @@ export async function translate({
fields = [...fields, ...extraFields]
}
+ const readabilityContent = getReadabilityContent()[entry.entries.id]?.content
fields = fields.filter((field) => {
if (language && field === "readabilityContent") {
- const content = getReadabilityContent()[entry.entries.id]?.content
- if (!content) return false
+ if (!readabilityContent) return false
const isLanguageMatch = checkLanguage({
- content,
+ content: readabilityContent,
language,
})
return !isLanguageMatch
@@ -91,5 +88,20 @@ export async function translate({
part,
},
})
- return res.data
+
+ const data: {
+ description?: string
+ title?: string
+ content?: string
+ readabilityContent?: string
+ } = {}
+
+ fields.forEach((field) => {
+ const content = field === "readabilityContent" ? readabilityContent : entry.entries[field]
+ if (content !== res.data?.[field]) {
+ data[field] = res.data?.[field]
+ }
+ })
+
+ return data
}
diff --git a/apps/desktop/src/renderer/src/lib/url-builder.ts b/apps/desktop/layer/renderer/src/lib/url-builder.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/url-builder.ts
rename to apps/desktop/layer/renderer/src/lib/url-builder.ts
diff --git a/apps/desktop/src/renderer/src/lib/utils.ts b/apps/desktop/layer/renderer/src/lib/utils.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/lib/utils.ts
rename to apps/desktop/layer/renderer/src/lib/utils.ts
diff --git a/apps/desktop/src/renderer/src/lottie/achievement.lottie b/apps/desktop/layer/renderer/src/lottie/achievement.lottie
similarity index 100%
rename from apps/desktop/src/renderer/src/lottie/achievement.lottie
rename to apps/desktop/layer/renderer/src/lottie/achievement.lottie
diff --git a/apps/desktop/src/renderer/src/lottie/confetti.lottie b/apps/desktop/layer/renderer/src/lottie/confetti.lottie
similarity index 100%
rename from apps/desktop/src/renderer/src/lottie/confetti.lottie
rename to apps/desktop/layer/renderer/src/lottie/confetti.lottie
diff --git a/apps/desktop/src/renderer/src/lottie/star.lottie b/apps/desktop/layer/renderer/src/lottie/star.lottie
similarity index 100%
rename from apps/desktop/src/renderer/src/lottie/star.lottie
rename to apps/desktop/layer/renderer/src/lottie/star.lottie
diff --git a/apps/desktop/src/renderer/src/main.tsx b/apps/desktop/layer/renderer/src/main.tsx
similarity index 92%
rename from apps/desktop/src/renderer/src/main.tsx
rename to apps/desktop/layer/renderer/src/main.tsx
index dbc94cf20..cb46838bd 100644
--- a/apps/desktop/src/renderer/src/main.tsx
+++ b/apps/desktop/layer/renderer/src/main.tsx
@@ -4,7 +4,6 @@ import "./styles/main.css"
import { IN_ELECTRON, WEB_BUILD } from "@follow/shared/constants"
import { getOS } from "@follow/utils/utils"
-import { ClickToComponent } from "click-to-react-component"
import * as React from "react"
import ReactDOM from "react-dom/client"
import { RouterProvider } from "react-router/dom"
@@ -48,6 +47,5 @@ if (IN_ELECTRON) {
ReactDOM.createRoot($container).render(
-
,
)
diff --git a/apps/desktop/src/renderer/src/modules/achievement/AchievementModalContent.tsx b/apps/desktop/layer/renderer/src/modules/achievement/AchievementModalContent.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/achievement/AchievementModalContent.tsx
rename to apps/desktop/layer/renderer/src/modules/achievement/AchievementModalContent.tsx
diff --git a/apps/desktop/src/renderer/src/modules/achievement/hooks.tsx b/apps/desktop/layer/renderer/src/modules/achievement/hooks.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/achievement/hooks.tsx
rename to apps/desktop/layer/renderer/src/modules/achievement/hooks.tsx
diff --git a/apps/desktop/src/renderer/src/modules/action/action-card.tsx b/apps/desktop/layer/renderer/src/modules/action/action-card.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/action/action-card.tsx
rename to apps/desktop/layer/renderer/src/modules/action/action-card.tsx
diff --git a/apps/desktop/src/renderer/src/modules/action/action-setting.tsx b/apps/desktop/layer/renderer/src/modules/action/action-setting.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/action/action-setting.tsx
rename to apps/desktop/layer/renderer/src/modules/action/action-setting.tsx
diff --git a/apps/desktop/src/renderer/src/modules/action/feed-filter.tsx b/apps/desktop/layer/renderer/src/modules/action/feed-filter.tsx
similarity index 98%
rename from apps/desktop/src/renderer/src/modules/action/feed-filter.tsx
rename to apps/desktop/layer/renderer/src/modules/action/feed-filter.tsx
index b03f0d1b9..43885fe72 100644
--- a/apps/desktop/src/renderer/src/modules/action/feed-filter.tsx
+++ b/apps/desktop/layer/renderer/src/modules/action/feed-filter.tsx
@@ -1,6 +1,6 @@
import { Button } from "@follow/components/ui/button/index.js"
import { Input } from "@follow/components/ui/input/index.js"
-import { Radio, RadioGroup } from "@follow/components/ui/radio-group/index.js"
+import { RadioGroup, RadioGroupItem } from "@follow/components/ui/radio-group/motion.js"
import {
Select,
SelectContent,
@@ -100,8 +100,8 @@ export const FeedFilter = ({ index }: { index: number }) => {
})
}}
>
-
-
+ {
const newEntryNotification = useActionByIndex(index, (a) => a.result.newEntryNotification)
const silence = useActionByIndex(index, (a) => a.result.silence)
const block = useActionByIndex(index, (a) => a.result.block)
+ const star = useActionByIndex(index, (a) => a.result.star)
const rewriteRules = useActionByIndex(index, (a) => a.result.rewriteRules)
const webhooks = useActionByIndex(index, (a) => a.result.webhooks)
@@ -149,6 +150,17 @@ export const TargetActionList = ({ index }: { index: number }) => {
delete data.result.block
},
},
+ {
+ title: t("actions.action_card.star"),
+ icon: ,
+ enabled: !!star,
+ onInit: (data) => {
+ data.result.star = true
+ },
+ onRemove: (data) => {
+ delete data.result.star
+ },
+ },
{
title: t("actions.action_card.rewrite_rules"),
icon: ,
diff --git a/apps/desktop/src/renderer/src/modules/activation/ActivationModalContent.tsx b/apps/desktop/layer/renderer/src/modules/activation/ActivationModalContent.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/activation/ActivationModalContent.tsx
rename to apps/desktop/layer/renderer/src/modules/activation/ActivationModalContent.tsx
diff --git a/apps/desktop/src/renderer/src/modules/activation/NeedActivationToast.tsx b/apps/desktop/layer/renderer/src/modules/activation/NeedActivationToast.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/activation/NeedActivationToast.tsx
rename to apps/desktop/layer/renderer/src/modules/activation/NeedActivationToast.tsx
diff --git a/apps/desktop/src/renderer/src/modules/activation/index.tsx b/apps/desktop/layer/renderer/src/modules/activation/index.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/activation/index.tsx
rename to apps/desktop/layer/renderer/src/modules/activation/index.tsx
diff --git a/apps/desktop/src/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx b/apps/desktop/layer/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx
similarity index 89%
rename from apps/desktop/src/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx
rename to apps/desktop/layer/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx
index c7858ffdf..15dca8a56 100644
--- a/apps/desktop/src/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx
+++ b/apps/desktop/layer/renderer/src/modules/ai/ai-daily/EntryPlaceholderDaily.tsx
@@ -1,7 +1,7 @@
import { cn } from "@follow/utils/utils"
import { useSetAtom } from "jotai"
import type { FC } from "react"
-import { useContext } from "react"
+import { use } from "react"
import { EntryContentPlaceholderContext } from "~/modules/app-layout/entry-content/EntryContentPlaceholderContext"
@@ -26,7 +26,7 @@ export const EntryPlaceholderDaily = ({
const NormalDailyReportTitle: FC = ({ day }) => {
const { title, startDate, endDate } = useParseDailyDate(day)
- const setOpenedSummary = useSetAtom(useContext(EntryContentPlaceholderContext).openedSummary)
+ const setOpenedSummary = useSetAtom(use(EntryContentPlaceholderContext).openedSummary)
return (
-
@@ -164,7 +149,7 @@ const registerFormSchema = z
path: ["confirmPassword"],
})
-function RegisterForm() {
+export function RegisterForm() {
const { t } = useTranslation("app")
const form = useForm>({
diff --git a/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx b/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx
new file mode 100644
index 000000000..aeb8e8003
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx
@@ -0,0 +1,133 @@
+import { Spring } from "@follow/components/constants/spring.js"
+import { useMobile } from "@follow/components/hooks/useMobile.js"
+import { Folo } from "@follow/components/icons/folo.js"
+import { Logo } from "@follow/components/icons/logo.js"
+import { MotionButtonBase } from "@follow/components/ui/button/index.js"
+import { Divider } from "@follow/components/ui/divider/Divider.js"
+import type { LoginRuntime } from "@follow/shared/auth"
+import { stopPropagation } from "@follow/utils/dom"
+import { m } from "motion/react"
+import { useState } from "react"
+import { Trans, useTranslation } from "react-i18next"
+
+import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
+import { loginHandler } from "~/lib/auth"
+import { useAuthProviders } from "~/queries/users"
+
+import { LoginWithPassword, RegisterForm } from "./Form"
+
+interface LoginModalContentProps {
+ runtime: LoginRuntime
+ canClose?: boolean
+}
+
+export const LoginModalContent = (props: LoginModalContentProps) => {
+ const modal = useCurrentModal()
+
+ const { canClose = true, runtime } = props
+
+ const { t } = useTranslation()
+ const { data: authProviders } = useAuthProviders()
+
+ const isMobile = useMobile()
+
+ const providers = Object.entries(authProviders || [])
+
+ const [isRegister, setIsRegister] = useState(true)
+ const [isEmail, setIsEmail] = useState(false)
+
+ const Inner = (
+ <>
+
+
+
+
+
+ {isRegister ? t("signin.sign_up_to") : t("signin.sign_in_to")}
+
+
+
+
+ {/* {isRegister ? : } */}
+ {/* {providers.length > 0 && (
+
+ )} */}
+ {isEmail ? (
+ isRegister ? (
+
+ ) : (
+
+ )
+ ) : (
+
+ {providers.map(([key, provider]) => (
+
{
+ if (key === "credential") {
+ setIsEmail(true)
+ } else {
+ loginHandler(key, "app")
+ }
+ }}
+ className="center hover:bg-material-medium relative w-full gap-2 rounded-xl border p-2.5 pl-5 font-semibold duration-200"
+ >
+
+ {t("login.continueWith", { provider: provider.name })}
+
+ ))}
+
+ )}
+
+ {isEmail ? (
+ setIsEmail(false)}>
+ Back
+
+ ) : (
+ setIsRegister(!isRegister)}>
+ ,
+ }}
+ />
+
+ )}
+ >
+ )
+ if (isMobile) {
+ return Inner
+ }
+
+ return (
+
+ )
+}
diff --git a/apps/desktop/src/renderer/src/modules/boost/atom.ts b/apps/desktop/layer/renderer/src/modules/boost/atom.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/atom.ts
rename to apps/desktop/layer/renderer/src/modules/boost/atom.ts
diff --git a/apps/desktop/src/renderer/src/modules/boost/boost-certification.tsx b/apps/desktop/layer/renderer/src/modules/boost/boost-certification.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/boost-certification.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/boost-certification.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/boost-progress.tsx b/apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/boost-progress.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/boost-progress.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/boosting-contributors.tsx b/apps/desktop/layer/renderer/src/modules/boost/boosting-contributors.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/boosting-contributors.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/boosting-contributors.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/hooks.tsx b/apps/desktop/layer/renderer/src/modules/boost/hooks.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/hooks.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/hooks.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/level-benefits.tsx b/apps/desktop/layer/renderer/src/modules/boost/level-benefits.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/level-benefits.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/level-benefits.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/modal.tsx b/apps/desktop/layer/renderer/src/modules/boost/modal.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/modal.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/modal.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/query.tsx b/apps/desktop/layer/renderer/src/modules/boost/query.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/query.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/query.tsx
diff --git a/apps/desktop/src/renderer/src/modules/boost/radio-cards.tsx b/apps/desktop/layer/renderer/src/modules/boost/radio-cards.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/boost/radio-cards.tsx
rename to apps/desktop/layer/renderer/src/modules/boost/radio-cards.tsx
diff --git a/apps/desktop/src/renderer/src/modules/claim/feed-claim-modal.tsx b/apps/desktop/layer/renderer/src/modules/claim/feed-claim-modal.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/claim/feed-claim-modal.tsx
rename to apps/desktop/layer/renderer/src/modules/claim/feed-claim-modal.tsx
diff --git a/apps/desktop/src/renderer/src/modules/claim/hooks.ts b/apps/desktop/layer/renderer/src/modules/claim/hooks.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/claim/hooks.ts
rename to apps/desktop/layer/renderer/src/modules/claim/hooks.ts
diff --git a/apps/desktop/src/renderer/src/modules/claim/index.ts b/apps/desktop/layer/renderer/src/modules/claim/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/claim/index.ts
rename to apps/desktop/layer/renderer/src/modules/claim/index.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/README.md b/apps/desktop/layer/renderer/src/modules/command/README.md
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/README.md
rename to apps/desktop/layer/renderer/src/modules/command/README.md
diff --git a/apps/desktop/src/renderer/src/modules/command/command-button.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/command-button.test-d.ts
rename to apps/desktop/layer/renderer/src/modules/command/command-button.test-d.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/command-button.tsx b/apps/desktop/layer/renderer/src/modules/command/command-button.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/command-button.tsx
rename to apps/desktop/layer/renderer/src/modules/command/command-button.tsx
diff --git a/apps/desktop/src/renderer/src/modules/command/command-manager.ts b/apps/desktop/layer/renderer/src/modules/command/command-manager.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/command-manager.ts
rename to apps/desktop/layer/renderer/src/modules/command/command-manager.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/entry.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
similarity index 94%
rename from apps/desktop/src/renderer/src/modules/command/commands/entry.tsx
rename to apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
index dab085263..ad6654795 100644
--- a/apps/desktop/src/renderer/src/modules/command/commands/entry.tsx
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/entry.tsx
@@ -22,6 +22,7 @@ import { getRouteParams } from "~/hooks/biz/useRouteParams"
import { tipcClient } from "~/lib/client"
import { parseHtml } from "~/lib/parse-html"
import { useActivationModal } from "~/modules/activation"
+import { markAllByRoute } from "~/modules/entry-column/hooks/useMarkAll"
import { useGalleryModal } from "~/modules/entry-content/hooks"
import { useTipModal } from "~/modules/wallet/hooks"
import { entryActions, useEntryStore } from "~/store/entry"
@@ -295,6 +296,16 @@ export const useRegisterEntryCommands = () => {
return
},
},
+ {
+ id: COMMAND_ID.entry.readAbove,
+ label: t("entry_actions.mark_above_as_read"),
+ run: ({ publishedAt }: { publishedAt: string }) => {
+ return markAllByRoute({
+ startTime: new Date(publishedAt).getTime() + 1,
+ endTime: Date.now(),
+ })
+ },
+ },
{
id: COMMAND_ID.entry.read,
label: t("entry_actions.mark_as_read"),
@@ -314,6 +325,16 @@ export const useRegisterEntryCommands = () => {
}
},
},
+ {
+ id: COMMAND_ID.entry.readBelow,
+ label: t("entry_actions.mark_below_as_read"),
+ run: ({ publishedAt }: { publishedAt: string }) => {
+ return markAllByRoute({
+ startTime: 1,
+ endTime: new Date(publishedAt).getTime() - 1,
+ })
+ },
+ },
{
id: COMMAND_ID.entry.imageGallery,
label: t("entry_actions.image_gallery"),
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/id.ts b/apps/desktop/layer/renderer/src/modules/command/commands/id.ts
similarity index 95%
rename from apps/desktop/src/renderer/src/modules/command/commands/id.ts
rename to apps/desktop/layer/renderer/src/modules/command/commands/id.ts
index 9c7213f7b..5790d9a24 100644
--- a/apps/desktop/src/renderer/src/modules/command/commands/id.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/id.ts
@@ -1,20 +1,22 @@
export const COMMAND_ID = {
entry: {
- tip: "entry:tip",
- star: "entry:star",
- delete: "entry:delete",
- copyLink: "entry:copy-link",
- copyTitle: "entry:copy-title",
- openInBrowser: "entry:open-in-browser",
- viewSourceContent: "entry:view-source-content",
- share: "entry:share",
read: "entry:read",
+ readAbove: "entry:read-above",
+ readBelow: "entry:read-below",
+ viewSourceContent: "entry:view-source-content",
+ readability: "entry:ability",
+ openInBrowser: "entry:open-in-browser",
+ star: "entry:star",
toggleAISummary: "entry:toggle-ai-summary",
toggleAITranslation: "entry:toggle-ai-translation",
- exportAsPDF: "entry:export-as-pdf",
imageGallery: "entry:image-gallery",
+ copyLink: "entry:copy-link",
+ copyTitle: "entry:copy-title",
tts: "entry:tts",
- readability: "entry:ability",
+ exportAsPDF: "entry:export-as-pdf",
+ tip: "entry:tip",
+ delete: "entry:delete",
+ share: "entry:share",
},
integration: {
saveToEagle: "integration:save-to-eagle",
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/integration.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/commands/integration.tsx
rename to apps/desktop/layer/renderer/src/modules/command/commands/integration.tsx
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/list.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/list.tsx
similarity index 98%
rename from apps/desktop/src/renderer/src/modules/command/commands/list.tsx
rename to apps/desktop/layer/renderer/src/modules/command/commands/list.tsx
index 0d5c93034..f1f417243 100644
--- a/apps/desktop/src/renderer/src/modules/command/commands/list.tsx
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/list.tsx
@@ -7,7 +7,7 @@ import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry"
import { getRouteParams } from "~/hooks/biz/useRouteParams"
import { useDeleteSubscription } from "~/hooks/biz/useSubscriptionActions"
import { UrlBuilder } from "~/lib/url-builder"
-import { ListForm } from "~/modules/discover/list-form"
+import { ListForm } from "~/modules/discover/ListForm"
import { useRegisterCommandEffect } from "../hooks/use-register-command"
import { COMMAND_ID } from "./id"
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/settings.tsx b/apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/commands/settings.tsx
rename to apps/desktop/layer/renderer/src/modules/command/commands/settings.tsx
diff --git a/apps/desktop/src/renderer/src/modules/command/commands/types.ts b/apps/desktop/layer/renderer/src/modules/command/commands/types.ts
similarity index 87%
rename from apps/desktop/src/renderer/src/modules/command/commands/types.ts
rename to apps/desktop/layer/renderer/src/modules/command/commands/types.ts
index 07e7eb88a..17bd050aa 100644
--- a/apps/desktop/src/renderer/src/modules/command/commands/types.ts
+++ b/apps/desktop/layer/renderer/src/modules/command/commands/types.ts
@@ -47,12 +47,22 @@ export type ViewSourceContentCommand = Command<{
export type ShareCommand = Command<{
id: typeof COMMAND_ID.entry.share
- fn: ({ entryId }) => void
+ fn: (data: { entryId: string }) => void
}>
export type ReadCommand = Command<{
id: typeof COMMAND_ID.entry.read
- fn: ({ entryId }) => void
+ fn: (data: { entryId: string }) => void
+}>
+
+export type ReadAboveCommand = Command<{
+ id: typeof COMMAND_ID.entry.readAbove
+ fn: (data: { publishedAt: string }) => void
+}>
+
+export type ReadBelowCommand = Command<{
+ id: typeof COMMAND_ID.entry.readBelow
+ fn: (data: { publishedAt: string }) => void
}>
export type ToggleAISummaryCommand = Command<{
@@ -67,17 +77,17 @@ export type ToggleAITranslationCommand = Command<{
export type ImageGalleryCommand = Command<{
id: typeof COMMAND_ID.entry.imageGallery
- fn: ({ entryId }) => void
+ fn: (data: { entryId: string }) => void
}>
export type TTSCommand = Command<{
id: typeof COMMAND_ID.entry.tts
- fn: ({ entryId, entryContent }) => void
+ fn: (data: { entryId: string; entryContent: string }) => void
}>
export type ReadabilityCommand = Command<{
id: typeof COMMAND_ID.entry.readability
- fn: ({ entryId, entryUrl }) => void
+ fn: (data: { entryId: string; entryUrl: string }) => void
}>
export type EntryCommand =
@@ -91,6 +101,8 @@ export type EntryCommand =
| ViewSourceContentCommand
| ShareCommand
| ReadCommand
+ | ReadAboveCommand
+ | ReadBelowCommand
| ToggleAISummaryCommand
| ToggleAITranslationCommand
| ImageGalleryCommand
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-command.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-command.test-d.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-command.test-d.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-command.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-command.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-command.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-command.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-register-command.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-command.test-d.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-register-command.test-d.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-register-command.test-d.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-register-command.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-command.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-register-command.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-register-command.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-register-hotkey.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.test-d.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-register-hotkey.test-d.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.test-d.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/hooks/use-register-hotkey.ts b/apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/hooks/use-register-hotkey.ts
rename to apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/registry/command.test-d.ts b/apps/desktop/layer/renderer/src/modules/command/registry/command.test-d.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/registry/command.test-d.ts
rename to apps/desktop/layer/renderer/src/modules/command/registry/command.test-d.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/registry/command.ts b/apps/desktop/layer/renderer/src/modules/command/registry/command.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/registry/command.ts
rename to apps/desktop/layer/renderer/src/modules/command/registry/command.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/registry/registry.ts b/apps/desktop/layer/renderer/src/modules/command/registry/registry.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/registry/registry.ts
rename to apps/desktop/layer/renderer/src/modules/command/registry/registry.ts
diff --git a/apps/desktop/src/renderer/src/modules/command/types.ts b/apps/desktop/layer/renderer/src/modules/command/types.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/command/types.ts
rename to apps/desktop/layer/renderer/src/modules/command/types.ts
diff --git a/apps/desktop/src/renderer/src/modules/customize-toolbar/constant.ts b/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
similarity index 80%
rename from apps/desktop/src/renderer/src/modules/customize-toolbar/constant.ts
rename to apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
index b6d485f61..c9826cd08 100644
--- a/apps/desktop/src/renderer/src/modules/customize-toolbar/constant.ts
+++ b/apps/desktop/layer/renderer/src/modules/customize-toolbar/constant.ts
@@ -15,10 +15,16 @@ const entryItemInMore = new Set([
COMMAND_ID.entry.tts,
])
+export const entryItemHideInHeader = new Set([
+ COMMAND_ID.entry.readAbove,
+ COMMAND_ID.entry.readBelow,
+])
+
export const DEFAULT_ACTION_ORDER: ToolbarActionOrder = {
main: Object.values(COMMAND_ID.entry).filter((id) => !entryItemInMore.has(id)),
more: [
...Object.values(COMMAND_ID.integration),
...Object.values(COMMAND_ID.entry).filter((id) => entryItemInMore.has(id)),
+ COMMAND_ID.settings.customizeToolbar,
],
}
diff --git a/apps/desktop/src/renderer/src/modules/customize-toolbar/dnd.tsx b/apps/desktop/layer/renderer/src/modules/customize-toolbar/dnd.tsx
similarity index 62%
rename from apps/desktop/src/renderer/src/modules/customize-toolbar/dnd.tsx
rename to apps/desktop/layer/renderer/src/modules/customize-toolbar/dnd.tsx
index 50e2b6545..62f4c700e 100644
--- a/apps/desktop/src/renderer/src/modules/customize-toolbar/dnd.tsx
+++ b/apps/desktop/layer/renderer/src/modules/customize-toolbar/dnd.tsx
@@ -1,9 +1,18 @@
import type { UniqueIdentifier } from "@dnd-kit/core"
import { useSortable } from "@dnd-kit/sortable"
import { CSS } from "@dnd-kit/utilities"
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipPortal,
+ TooltipTrigger,
+} from "@follow/components/ui/tooltip/index.js"
+import { IN_ELECTRON } from "@follow/shared"
import type { ReactNode } from "react"
import { useMemo } from "react"
+import { useTranslation } from "react-i18next"
+import { COMMAND_ID } from "../command/commands/id"
import { getCommand } from "../command/hooks/use-command"
import type { FollowCommandId } from "../command/types"
@@ -40,16 +49,43 @@ const SortableItem = ({ id, children }: { id: UniqueIdentifier; children: ReactN
)
}
+const warningActionButton: Partial<
+ Record<
+ FollowCommandId,
+ {
+ show: boolean
+ info: string
+ }
+ >
+> = {
+ [COMMAND_ID.entry.tts]: {
+ show: !IN_ELECTRON,
+ info: "entry_actions.warn_info_for_desktop",
+ },
+}
+
export const SortableActionButton = ({ id }: { id: UniqueIdentifier }) => {
const cmd = getCommand(id as FollowCommandId)
+ const warnInfo = warningActionButton[id as FollowCommandId]
+ const { t } = useTranslation()
if (!cmd) return null
return (
-
+
{typeof cmd.icon === "function" ? cmd.icon({ isActive: false }) : cmd.icon}
-
+
+ {warnInfo?.show && (
+
+
+
+
+
+ {t(warnInfo.info as any)}
+
+
+ )}
{cmd.label.title}
@@ -69,7 +105,7 @@ export function DroppableContainer({
})
return (
{
const actionOrderSetting = useUISettingSelector((s) => s.toolbarOrder)
@@ -17,8 +17,12 @@ export const useActionOrder = () => {
)
return {
- main: [...actionOrderSetting.main, ...missingMainActions],
- more: [...actionOrderSetting.more, ...missingMoreActions],
+ main: [...actionOrderSetting.main, ...missingMainActions].filter(
+ (id) => !entryItemHideInHeader.has(id as string),
+ ),
+ more: [...actionOrderSetting.more, ...missingMoreActions].filter(
+ (id) => !entryItemHideInHeader.has(id as string),
+ ),
}
}, [actionOrderSetting])
}
diff --git a/apps/desktop/src/renderer/src/modules/customize-toolbar/modal.tsx b/apps/desktop/layer/renderer/src/modules/customize-toolbar/modal.tsx
similarity index 88%
rename from apps/desktop/src/renderer/src/modules/customize-toolbar/modal.tsx
rename to apps/desktop/layer/renderer/src/modules/customize-toolbar/modal.tsx
index df1977373..b4e01ad09 100644
--- a/apps/desktop/src/renderer/src/modules/customize-toolbar/modal.tsx
+++ b/apps/desktop/layer/renderer/src/modules/customize-toolbar/modal.tsx
@@ -14,7 +14,7 @@ import {
verticalListSortingStrategy,
} from "@dnd-kit/sortable"
import { Button } from "@follow/components/ui/button/index.js"
-import { useCallback } from "react"
+import { useCallback, useRef } from "react"
import { useTranslation } from "react-i18next"
import { setUISetting } from "~/atoms/settings/ui"
@@ -74,9 +74,9 @@ const CustomizeToolbar = () => {
[actionOrder],
)
- const resetActionOrder = useCallback(() => {
+ const resetActionOrder = useRef(() => {
setUISetting("toolbarOrder", DEFAULT_ACTION_ORDER)
- }, [])
+ }).current
return (
{
onPointerDown={(event) => event.stopPropagation()}
>
-
{t("customizeToolbar.quick_actions.title")}
-
{t("customizeToolbar.quick_actions.description")}
+
+ {t("customizeToolbar.quick_actions.title")}
+
+
+ {t("customizeToolbar.quick_actions.description")}
+
{/* Refer to https://github.com/clauderic/dnd-kit/blob/master/stories/2%20-%20Presets/Sortable/MultipleContainers.tsx */}
@@ -105,8 +109,10 @@ const CustomizeToolbar = () => {
{/* More panel */}
-
{t("customizeToolbar.more_actions.title")}
-
+
+ {t("customizeToolbar.more_actions.title")}
+
+
{t("customizeToolbar.more_actions.description")}
diff --git a/apps/desktop/src/renderer/src/modules/debug/registry.ts b/apps/desktop/layer/renderer/src/modules/debug/registry.ts
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/debug/registry.ts
rename to apps/desktop/layer/renderer/src/modules/debug/registry.ts
diff --git a/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx
new file mode 100644
index 000000000..e135ab80f
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedCard.tsx
@@ -0,0 +1,252 @@
+import { Button } from "@follow/components/ui/button/index.js"
+import { Card, CardContent, CardHeader } from "@follow/components/ui/card/index.jsx"
+import { RelativeTime } from "@follow/components/ui/datetime/index.js"
+import { getBackgroundGradient } from "@follow/utils/color"
+import { cn } from "@follow/utils/utils"
+import type { FC } from "react"
+import { memo, useMemo } from "react"
+import { useTranslation } from "react-i18next"
+import { useLocation } from "react-router"
+
+import { Media } from "~/components/ui/media"
+import { useFollow } from "~/hooks/biz/useFollow"
+import { navigateEntry } from "~/hooks/biz/useNavigateEntry"
+import { useFeedSafeUrl } from "~/hooks/common/useFeedSafeUrl"
+import type { apiClient } from "~/lib/api-fetch"
+import { useIsSubscribed } from "~/store/subscription"
+
+import { FollowSummary } from "../feed/feed-summary"
+
+export type DiscoverItem = Awaited>["data"][number]
+
+export const FeedCardActions: FC<{
+ item: DiscoverItem
+ onSuccess?: (item: DiscoverItem) => void
+ isSubscribed: boolean
+ followButtonVariant?: "ghost" | "outline"
+ followedButtonVariant?: "ghost" | "outline"
+ followButtonClassName?: string
+ followedButtonClassName?: string
+}> = memo(
+ ({
+ item,
+ onSuccess,
+ isSubscribed,
+ followButtonVariant,
+ followedButtonVariant = "ghost",
+ followButtonClassName,
+ followedButtonClassName,
+ }) => {
+ const follow = useFollow()
+ const { t } = useTranslation()
+ const location = useLocation()
+
+ return (
+
+ {!isSubscribed && (
+
+ )}
+
+
+ )
+ },
+)
+
+interface DiscoverFeedCardProps {
+ item: DiscoverItem
+ onSuccess?: (item: DiscoverItem) => void
+ onUnSubscribed?: (item: DiscoverItem) => void
+
+ className?: string
+}
+
+export const DiscoverFeedCard: FC = memo(
+ ({ item, onSuccess, className }) => {
+ const numberFormatter = useMemo(() => new Intl.NumberFormat("en-US", {}), [])
+ const { t } = useTranslation()
+
+ const isSubscribed = useIsSubscribed(item.feed?.id || item.list?.id || "")
+
+ return (
+
+
+
+
+ {item.docs ? (
+
+
+
+
+
+ ) : (
+ <>
+
+ {!!item.entries?.length && (
+
+
+ {item.entries
+ .filter((e) => !!e)
+ .map((entry) => (
+
+ ))}
+
+
+ )}
+
+
+ {!!item.analytics?.subscriptionCount && (
+
+
+
+
+ {numberFormatter.format(item.analytics.subscriptionCount)}{" "}
+ {t("feed.follower", { count: item.analytics.subscriptionCount })}
+
+
+ )}
+ {item.analytics?.updatesPerWeek ? (
+
+
+
+ {t("feed.entry_week", { count: item.analytics.updatesPerWeek ?? 0 })}
+
+
+ ) : item.analytics?.latestEntryPublishedAt ? (
+
+
+ {t("feed.updated_at")}
+
+
+ ) : null}
+
+
+
+
+
+ >
+ )}
+
+ )
+ },
+)
+
+const SearchResultContent: FC<{
+ entry: NonUndefined[number]
+}> = memo(({ entry }) => {
+ const safeUrl = useFeedSafeUrl(entry.id)
+ return (
+
+
+
+
+
+ {entry.title ? (
+
+ {entry.title}
+
+ ) : (
+
+
+ {entry.url || "Untitled"}
+
+ )}
+
+
+
+
+
+ )
+})
+
+const FeedCardMediaThumbnail: FC<{
+ entry: NonUndefined[number]
+}> = ({ entry }) => {
+ const [, , , bgAccent, bgAccentLight] = getBackgroundGradient(
+ entry.title || entry.url || "Untitled",
+ )
+
+ if (entry.media?.[0]) {
+ return (
+
+ )
+ }
+
+ return (
+
+
+
+ {entry.title ? (
+
+ {entry.title.slice(0, 1).toUpperCase()}
+
+ ) : (
+
+ )}
+
+
+
+ )
+}
diff --git a/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedForm.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedForm.tsx
new file mode 100644
index 000000000..f3a3d4545
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverFeedForm.tsx
@@ -0,0 +1,425 @@
+import { Spring } from "@follow/components/constants/spring.js"
+import { Button } from "@follow/components/ui/button/index.js"
+import { Form, FormField, FormItem, FormLabel } from "@follow/components/ui/form/index.jsx"
+import { Input } from "@follow/components/ui/input/index.js"
+import { RootPortal } from "@follow/components/ui/portal/index.js"
+import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@follow/components/ui/select/index.jsx"
+import { nextFrame } from "@follow/utils/dom"
+import {
+ MissingOptionalParamError,
+ parseFullPathParams,
+ parseRegexpPathParams,
+ regexpPathToPath,
+} from "@follow/utils/path-parser"
+import { cn } from "@follow/utils/utils"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { m } from "motion/react"
+import type { FC } from "react"
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from "react"
+import type { UseFormReturn } from "react-hook-form"
+import { useForm } from "react-hook-form"
+import { Trans, useTranslation } from "react-i18next"
+import { toast } from "sonner"
+import { z } from "zod"
+
+import { CopyButton } from "~/components/ui/button/CopyButton"
+import { Markdown } from "~/components/ui/markdown/Markdown"
+import {
+ useCurrentModal,
+ useIsInModal,
+ useIsTopModal,
+ useModalStack,
+} from "~/components/ui/modal/stacked/hooks"
+
+import { FeedForm } from "./FeedForm"
+import type { RSSHubRoute } from "./types"
+import { normalizeRSSHubParameters } from "./utils"
+
+const FeedMaintainers = ({ maintainers }: { maintainers?: string[] }) => {
+ if (!maintainers || maintainers.length === 0) {
+ return null
+ }
+
+ return (
+
+ )
+}
+
+const routeParamsKeyPrefix = "route-params-"
+
+export type RouteParams = Record<
+ string,
+ {
+ description: string
+ default?: string
+ }
+>
+
+export const DiscoverFeedForm = ({
+ route,
+ routePrefix,
+ noDescription,
+ routeParams,
+ viewportClassName,
+}: {
+ route: RSSHubRoute
+ routePrefix: string
+ noDescription?: boolean
+ routeParams?: RouteParams
+ viewportClassName?: string
+}) => {
+ const { t } = useTranslation()
+ const keys = useMemo(
+ () =>
+ parseRegexpPathParams(route.path, {
+ excludeNames: [
+ "routeParams",
+ "functionalFlag",
+ "fulltext",
+ "disableEmbed",
+ "date",
+ "language",
+ "lang",
+ "sort",
+ ],
+ forceExcludeNames: routeParams ? ["routeParams"] : [],
+ }),
+ [route.path, routeParams],
+ )
+
+ const formPlaceholder = useMemo>(() => {
+ if (!route.example) return {}
+ return parseFullPathParams(route.example.replace(`/${routePrefix}`, ""), route.path)
+ }, [route.example, route.path, routePrefix])
+ const dynamicFormSchema = useMemo(
+ () =>
+ z.object({
+ ...Object.fromEntries(
+ keys
+ .map((keyItem) => [
+ keyItem.name,
+ keyItem.optional ? z.string().optional().nullable() : z.string().min(1),
+ ])
+ .concat(
+ routeParams
+ ? Object.entries(routeParams).map(([key]) => [
+ `${routeParamsKeyPrefix}${key}`,
+ z.string(),
+ ])
+ : [],
+ ),
+ ),
+ }),
+ [keys, routeParams],
+ )
+
+ const defaultValue = useMemo(() => {
+ const ret = {}
+ if (!route.parameters) return ret
+ for (const key in route.parameters) {
+ const params = normalizeRSSHubParameters(route.parameters[key]!)
+ if (!params) continue
+ ret[key] = params.default || ""
+ }
+ return ret
+ }, [route.parameters])
+
+ const form = useForm>({
+ resolver: zodResolver(dynamicFormSchema),
+ defaultValues: defaultValue,
+ mode: "all",
+ }) as UseFormReturn
+
+ const { present, dismissAll } = useModalStack()
+ const rootContainerRef = useRef(null)
+ const isInModal = useIsInModal()
+
+ const onSubmit = useCallback(
+ (_data: Record) => {
+ const data = Object.fromEntries(
+ Object.entries(_data).filter(([key]) => !key.startsWith(routeParamsKeyPrefix)),
+ )
+
+ try {
+ const routeParamsPath = encodeURIComponent(
+ Object.entries(_data)
+ .filter(([key, value]) => key.startsWith(routeParamsKeyPrefix) && value)
+ .map(([key, value]) => [key.slice(routeParamsKeyPrefix.length), value])
+ .map(([key, value]) => `${key}=${value}`)
+ .join("&"),
+ )
+
+ const fillRegexpPath = regexpPathToPath(
+ routeParams && routeParamsPath
+ ? route.path.slice(0, route.path.indexOf("/:routeParams"))
+ : route.path,
+ data,
+ )
+ const url = `rsshub://${routePrefix}${fillRegexpPath}`
+
+ const finalUrl = routeParams && routeParamsPath ? `${url}/${routeParamsPath}` : url
+
+ present({
+ title: t("feed_form.add_feed"),
+ modalContentClassName: "overflow-visible",
+ content: () => ,
+ })
+ } catch (err: unknown) {
+ if (err instanceof MissingOptionalParamError) {
+ toast.error(err.message)
+ const idx = keys.findIndex((item) => item.name === err.param)
+
+ form.setFocus(keys[idx === 0 ? 0 : idx - 1]!.name, {
+ shouldSelect: true,
+ })
+ }
+ }
+ },
+ [dismissAll, form, keys, present, route, routeParams, routePrefix],
+ )
+
+ const formElRef = useRef(null)
+ const isTop = useIsTopModal()
+ useLayoutEffect(() => {
+ if (!isTop) return
+ const $form = formElRef.current
+ if (!$form) return
+ $form.querySelectorAll("input")[0]?.focus()
+ }, [formElRef, isTop])
+
+ const modal = useCurrentModal()
+
+ useEffect(() => {
+ modal.setClickOutSideToDismiss(!form.formState.isDirty)
+ }, [form.formState.isDirty, modal])
+
+ return (
+
+
+
+ {!noDescription &&
}
+
+ )
+}
+
+const ReadmeAside = ({ description }: { description?: string }) => {
+ const { modalElementRef } = useCurrentModal()
+ const { t } = useTranslation()
+ useLayoutEffect(() => {
+ if (!modalElementRef.current) return
+ modalElementRef.current.style.overflow = "visible"
+ modalElementRef.current.style.zIndex = "2"
+ }, [modalElementRef])
+
+ if (!description) return null
+ return (
+
+
+
+
+ {t("discover.feed_description")}
+
+
+
+
+ {/* Fix markdown directive */}
+ {description.replaceAll("::: ", ":::")}
+
+
+
+
+
+
+ )
+}
+
+const PreviewUrl: FC<{
+ watch: UseFormReturn["watch"]
+ path: string
+ routePrefix: string
+}> = ({ watch, path, routePrefix }) => {
+ const data = watch()
+
+ const fullPath = useMemo(() => {
+ try {
+ return regexpPathToPath(path, data)
+ } catch (err: unknown) {
+ console.info((err as Error).message)
+ return path
+ }
+ }, [path, data])
+
+ const renderedPath = `${routePrefix}${fullPath}`
+ return (
+
+
+ {renderedPath}
+
+
+
+
+
+ )
+}
diff --git a/apps/desktop/layer/renderer/src/modules/discover/DiscoverForm.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverForm.tsx
new file mode 100644
index 000000000..d433020b4
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverForm.tsx
@@ -0,0 +1,320 @@
+import { useMobile } from "@follow/components/hooks/useMobile.js"
+import { Button, MotionButtonBase } from "@follow/components/ui/button/index.js"
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@follow/components/ui/form/index.jsx"
+import { Input } from "@follow/components/ui/input/index.js"
+import { SegmentGroup, SegmentItem } from "@follow/components/ui/segment/index.js"
+import { ResponsiveSelect } from "@follow/components/ui/select/responsive.js"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { repository } from "@pkg"
+import { useMutation } from "@tanstack/react-query"
+import { produce } from "immer"
+import { atom, useAtomValue, useStore } from "jotai"
+import type { ChangeEvent } from "react"
+import { useCallback, useState } from "react"
+import { useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+import { z } from "zod"
+
+import { useIsInMASReview } from "~/atoms/server-configs"
+import { useModalStack } from "~/components/ui/modal/stacked/hooks"
+import { apiClient } from "~/lib/api-fetch"
+
+import { DiscoverFeedCard } from "./DiscoverFeedCard"
+import { FeedForm } from "./FeedForm"
+
+const formSchema = z.object({
+ keyword: z.string().min(1),
+ target: z.enum(["feeds", "lists"]),
+})
+
+const info: Record<
+ string,
+ {
+ label: I18nKeys
+ prefix?: string[]
+ showModal?: boolean
+ default?: string
+ labelSuffix?: React.ReactNode
+ }
+> = {
+ search: {
+ label: "discover.any_url_or_keyword",
+ },
+ rss: {
+ label: "discover.rss_url",
+ default: "https://",
+ prefix: ["https://", "http://"],
+ showModal: true,
+ labelSuffix: (
+
+
+ Folo Flavored Feed Spec
+
+ ),
+ },
+ rsshub: {
+ label: "discover.rss_hub_route",
+ prefix: ["rsshub://"],
+ default: "rsshub://",
+ showModal: true,
+ labelSuffix: (
+
+
+ RSSHub Docs
+
+ ),
+ },
+}
+
+type DiscoverSearchData = Awaited>["data"]
+export function DiscoverForm({ type = "search" }: { type?: string }) {
+ const { prefix, default: defaultValue } = info[type]!
+ const form = useForm>({
+ resolver: zodResolver(formSchema),
+ defaultValues: {
+ keyword: defaultValue || "",
+ target: "feeds",
+ },
+ })
+ const { t } = useTranslation()
+ const isInMASReview = useIsInMASReview()
+
+ const jotaiStore = useStore()
+ const mutation = useMutation({
+ mutationFn: async ({ keyword, target }: { keyword: string; target: "feeds" | "lists" }) => {
+ let { data } = await apiClient.discover.$post({
+ json: {
+ keyword: keyword.trim(),
+ target,
+ },
+ })
+ if (isInMASReview) {
+ data = data.filter((item) => !item.list?.fee)
+ }
+
+ jotaiStore.set(discoverSearchDataAtom, data)
+
+ return data
+ },
+ })
+ const discoverSearchDataAtom = useState(() => atom())[0]
+
+ const discoverSearchData = useAtomValue(discoverSearchDataAtom)
+
+ const { present, dismissAll } = useModalStack()
+
+ function onSubmit(values: z.infer) {
+ if (info[type]!.showModal) {
+ present({
+ title: t("feed_form.add_feed"),
+ content: () => ,
+ })
+ } else {
+ mutation.mutate(values)
+ }
+ }
+
+ const handleKeywordChange = useCallback(
+ (event: ChangeEvent) => {
+ const trimmedKeyword = event.target.value.trimStart()
+ if (!prefix) {
+ form.setValue("keyword", trimmedKeyword, { shouldValidate: true })
+ return
+ }
+ const isValidPrefix = prefix.find((p) => trimmedKeyword.startsWith(p))
+ if (!isValidPrefix) {
+ form.setValue("keyword", prefix[0]!)
+ return
+ }
+ if (trimmedKeyword.startsWith(`${isValidPrefix}${isValidPrefix}`)) {
+ form.setValue("keyword", trimmedKeyword.slice(isValidPrefix.length))
+ return
+ }
+ form.setValue("keyword", trimmedKeyword)
+ },
+ [form, prefix],
+ )
+
+ const handleSuccess = useCallback(
+ (item: DiscoverSearchData[number]) => {
+ const currentData = jotaiStore.get(discoverSearchDataAtom)
+ if (!currentData) return
+ jotaiStore.set(
+ discoverSearchDataAtom,
+ produce(currentData, (draft) => {
+ const sub = draft.find((i) => {
+ if (item.feed) {
+ return i.feed?.id === item.feed.id
+ }
+ if (item.list) {
+ return i.list?.id === item.list.id
+ }
+ return false
+ })
+ if (!sub) return
+ sub.subscriptionCount = -~(sub.subscriptionCount as number)
+ }),
+ )
+ },
+ [discoverSearchDataAtom, jotaiStore],
+ )
+
+ const handleUnSubscribed = useCallback(
+ (item: DiscoverSearchData[number]) => {
+ const currentData = jotaiStore.get(discoverSearchDataAtom)
+ if (!currentData) return
+ jotaiStore.set(
+ discoverSearchDataAtom,
+ produce(currentData, (draft) => {
+ const sub = draft.find(
+ (i) => i.feed?.id === item.feed?.id || i.list?.id === item.list?.id,
+ )
+ if (!sub) return
+ sub.subscriptionCount = Number.isNaN(sub.subscriptionCount)
+ ? 0
+ : (sub.subscriptionCount as number) - 1
+ }),
+ )
+ },
+ [discoverSearchDataAtom, jotaiStore],
+ )
+
+ const handleTargetChange = useCallback(
+ (value: string) => {
+ form.setValue("target", value as "feeds" | "lists")
+ },
+ [form],
+ )
+
+ const isMobile = useMobile()
+
+ return (
+ <>
+
+
+ {mutation.isSuccess && (
+
+
+ {t("discover.search.results", { count: mutation.data?.length || 0 })}
+
+ {mutation.data?.length > 0 && (
+
+
+
+ )}
+
+
+ {discoverSearchData?.map((item) => (
+
+ ))}
+
+
+ )}
+ >
+ )
+}
diff --git a/apps/desktop/src/renderer/src/modules/discover/import.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverImport.tsx
similarity index 63%
rename from apps/desktop/src/renderer/src/modules/discover/import.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/DiscoverImport.tsx
index 3d383096d..e51ecf30f 100644
--- a/apps/desktop/src/renderer/src/modules/discover/import.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverImport.tsx
@@ -1,3 +1,9 @@
+import {
+ Accordion,
+ AccordionContent,
+ AccordionItem,
+ AccordionTrigger,
+} from "@follow/components/ui/accordion/index.js"
import { Button } from "@follow/components/ui/button/index.js"
import { Card, CardContent, CardHeader } from "@follow/components/ui/card/index.jsx"
import {
@@ -5,7 +11,6 @@ import {
FormControl,
FormField,
FormItem,
- FormLabel,
FormMessage,
} from "@follow/components/ui/form/index.jsx"
import { Input } from "@follow/components/ui/input/index.js"
@@ -18,6 +23,7 @@ import { Trans, useTranslation } from "react-i18next"
import { z } from "zod"
import { DropZone } from "~/components/ui/drop-zone"
+import { Media } from "~/components/ui/media"
import { apiFetch } from "~/lib/api-fetch"
import { toastFetchError } from "~/lib/error-parser"
import { Queries } from "~/queries"
@@ -65,7 +71,7 @@ const list: {
},
]
-export function DiscoverImport({ isInit = false }: { isInit?: boolean }) {
+export function DiscoverImport() {
const form = useForm>({
resolver: zodResolver(formSchema),
})
@@ -104,7 +110,86 @@ export function DiscoverImport({ isInit = false }: { isInit?: boolean }) {
const { t } = useTranslation()
return (
- <>
+
+
1. {t("discover.import.opml_step1")}
+
+
+
+
+ {t("discover.import.opml_step1_inoreader")}
+
+
+
+
+ inoreader.com/preferences/content
+
+ ),
+ }}
+ />
+
+ {t("discover.import.opml_step1_inoreader_step2")}
+ {t("discover.import.opml_step1_inoreader_step3")}
+
+
+
+
+
+ {t("discover.import.opml_step1_feedly")}
+
+
+
+
+ feedly.com/i/opml
+
+ ),
+ }}
+ />
+
+ {t("discover.import.opml_step1_feedly_step2")}
+
+
+
+
+
+ {t("discover.import.opml_step1_other")}
+
+
+ {t("discover.import.opml_step1_other_step1")}
+
+
+
+
+
2. {t("discover.import.opml_step2")}
)}
- >
+
)
}
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-list-form.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
similarity index 93%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-list-form.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
index ae423a5fb..bba2ee6bc 100644
--- a/apps/desktop/src/renderer/src/modules/discover/inbox-list-form.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverInboxList.tsx
@@ -10,8 +10,8 @@ import { CustomSafeError } from "~/errors/CustomSafeError"
import { useInboxList } from "~/queries/inboxes"
import { useActivationModal } from "../activation"
-import { InboxForm } from "./inbox-form"
-import { InboxTable } from "./inbox-table"
+import { InboxForm } from "./InboxForm"
+import { InboxTable } from "./InboxTable"
const useCanCreateMoreInboxAndNotify = () => {
const role = useUserRole()
@@ -46,7 +46,7 @@ export function DiscoverInboxList() {
const preCheck = useCanCreateMoreInboxAndNotify()
return (
-
+
{t("discover.inbox.description")}
{data?.rsshub!.routes && (
-
+
)}
diff --git a/apps/desktop/src/renderer/src/modules/discover/user-form.tsx b/apps/desktop/layer/renderer/src/modules/discover/DiscoverUser.tsx
similarity index 94%
rename from apps/desktop/src/renderer/src/modules/discover/user-form.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/DiscoverUser.tsx
index ca4ed6050..79a901396 100644
--- a/apps/desktop/src/renderer/src/modules/discover/user-form.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/DiscoverUser.tsx
@@ -33,7 +33,6 @@ export function DiscoverUser() {
routePrefix="follow"
route={data.follow.routes[Object.keys(data.follow.routes)[0]!]!}
noDescription
- submitButtonClassName="justify-center"
/>
)}
diff --git a/apps/desktop/src/renderer/src/modules/discover/feed-form.tsx b/apps/desktop/layer/renderer/src/modules/discover/FeedForm.tsx
similarity index 65%
rename from apps/desktop/src/renderer/src/modules/discover/feed-form.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/FeedForm.tsx
index 557c43451..d990247c6 100644
--- a/apps/desktop/src/renderer/src/modules/discover/feed-form.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/FeedForm.tsx
@@ -1,5 +1,4 @@
import { Button } from "@follow/components/ui/button/index.js"
-import { Card, CardHeader } from "@follow/components/ui/card/index.jsx"
import {
Form,
FormControl,
@@ -11,9 +10,11 @@ import {
} from "@follow/components/ui/form/index.jsx"
import { Input } from "@follow/components/ui/input/index.js"
import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
+import { RootPortal } from "@follow/components/ui/portal/index.js"
+import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
import { Switch } from "@follow/components/ui/switch/index.jsx"
import { FeedViewType } from "@follow/constants"
-import type { EntryModelSimple, FeedModel } from "@follow/models/types"
+import type { EntryModelSimple, FeedAnalyticsModel, FeedModel } from "@follow/models/types"
import { tracker } from "@follow/tracker"
import { cn } from "@follow/utils/utils"
import { zodResolver } from "@hookform/resolvers/zod"
@@ -25,20 +26,20 @@ import { toast } from "sonner"
import { z } from "zod"
import { Autocomplete } from "~/components/ui/auto-completion"
-import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
+import { useCurrentModal, useIsInModal } from "~/components/ui/modal/stacked/hooks"
+import { getRouteParams } from "~/hooks/biz/useRouteParams"
import { useAuthQuery, useI18n } from "~/hooks/common"
import { apiClient } from "~/lib/api-fetch"
import { tipcClient } from "~/lib/client"
-import { getFetchErrorMessage, toastFetchError } from "~/lib/error-parser"
-import { getNewIssueUrl } from "~/lib/issues"
-import { FollowSummary } from "~/modules/feed/feed-summary"
-import { feed as feedQuery, useFeed } from "~/queries/feed"
+import { toastFetchError } from "~/lib/error-parser"
+import { feed as feedQuery, useFeedQuery } from "~/queries/feed"
import { subscription as subscriptionQuery } from "~/queries/subscriptions"
import { useFeedByIdOrUrl } from "~/store/feed"
import { useSubscriptionByFeedId } from "~/store/subscription"
import { feedUnreadActions } from "~/store/unread"
import { ViewSelectorRadioGroup } from "../shared/ViewSelectorRadioGroup"
+import { FeedSummary } from "./FeedSummary"
const formSchema = z.object({
view: z.string(),
@@ -48,18 +49,16 @@ const formSchema = z.object({
})
export type FeedFormDataValuesType = z.infer
-const defaultValue = { view: FeedViewType.Articles.toString() } as FeedFormDataValuesType
-
export const FeedForm: Component<{
url?: string
id?: string
defaultValues?: FeedFormDataValuesType
onSuccess?: () => void
-}> = ({ id: _id, defaultValues = defaultValue, url, onSuccess }) => {
+}> = ({ id: _id, defaultValues, url, onSuccess }) => {
const queryParams = { id: _id, url }
- const feedQuery = useFeed(queryParams)
+ const feedQuery = useFeedQuery(queryParams)
const id = feedQuery.data?.feed.id || _id
const feed = useFeedByIdOrUrl({
@@ -69,85 +68,89 @@ export const FeedForm: Component<{
const { t } = useTranslation()
+ const isInModal = useIsInModal()
+ const placeholderRef = useRef(null)
+
return (
- {feed ? (
-
{
+ switch (true) {
+ case !!feed: {
+ return (
+
+ {/* // Workaround for the issue with the scroll area viewport setting the display to
+ table // Learn more about the issue here: //
+ https://github.com/radix-ui/primitives/issues/926
+ https://github.com/radix-ui/primitives/issues/3129
+ https://github.com/radix-ui/primitives/pull/3225 */}
+
+
+
- ) : feedQuery.isLoading ? (
-
-
-
- ) : feedQuery.error ? (
-
-
-
{t("feed_form.error_fetching_feed")}
-
- {getFetchErrorMessage(feedQuery.error)}
-
-
-
-
-
-
-
-
- ) : (
-
-
-
{t("feed_form.feed_not_found")}
-
{url}
-
- )}
+ onSuccess,
+ subscriptionData: feedQuery.data?.subscription,
+ entries: feedQuery.data?.entries,
+ feed,
+ analytics: feedQuery.data?.analytics,
+ placeholderRef,
+ }}
+ />
+
+
+
+ )
+ }
+ case feedQuery.isLoading: {
+ return (
+
+
+
+ )
+ }
+ case !!feedQuery.error: {
+ return (
+
+
+
{t("feed_form.error_fetching_feed")}
+
+ )
+ }
+ default: {
+ return (
+
+
+
{t("feed_form.feed_not_found")}
+
+ )
+ }
+ }
+ }, [
+ defaultValues,
+ feed,
+ feedQuery.data?.entries,
+ feedQuery.data?.subscription,
+ feedQuery.error,
+ feedQuery.isLoading,
+ id,
+ isInModal,
+ onSuccess,
+ t,
+ url,
+ ])}
+
)
}
@@ -160,6 +163,9 @@ const FeedInnerForm = ({
subscriptionData,
feed,
entries,
+ analytics,
+
+ placeholderRef,
}: {
defaultValues?: z.infer
id?: string
@@ -173,14 +179,18 @@ const FeedInnerForm = ({
}
feed: FeedModel
entries?: EntryModelSimple[]
+ analytics?: FeedAnalyticsModel
+
+ placeholderRef: React.RefObject
}) => {
const subscription = useSubscriptionByFeedId(id || "") || subscriptionData
const isSubscribed = !!subscription
- const buttonRef = useRef(null)
const form = useForm>({
resolver: zodResolver(formSchema),
- defaultValues,
+ defaultValues: defaultValues || {
+ view: getRouteParams().view.toString() || FeedViewType.Articles.toString(),
+ },
})
const { setClickOutSideToDismiss, dismiss } = useCurrentModal()
@@ -198,6 +208,12 @@ const FeedInnerForm = ({
}
}, [subscription])
+ useEffect(() => {
+ if (analytics?.view !== undefined && !subscription && defaultValues?.view === undefined) {
+ form.setValue("view", `${analytics.view}`)
+ }
+ }, [analytics, subscription, defaultValues?.view])
+
const followMutation = useMutation({
mutationFn: async (values: z.infer) => {
const body = {
@@ -268,13 +284,13 @@ const FeedInnerForm = ({
return (
-
-
-
-
-
+
+
+
+ {isSubscribed && (
+
+ )}
+
+
+
)
}
diff --git a/apps/desktop/layer/renderer/src/modules/discover/FeedSummary.tsx b/apps/desktop/layer/renderer/src/modules/discover/FeedSummary.tsx
new file mode 100644
index 000000000..17e6d2286
--- /dev/null
+++ b/apps/desktop/layer/renderer/src/modules/discover/FeedSummary.tsx
@@ -0,0 +1,66 @@
+import { Skeleton } from "@follow/components/ui/skeleton/index.js"
+import type { FeedOrListRespModel } from "@follow/models"
+import type { FC } from "react"
+import { useMemo } from "react"
+import { useTranslation } from "react-i18next"
+
+import { RelativeTime } from "~/components/ui/datetime"
+
+import { FollowSummary } from "../feed/feed-summary"
+
+export interface FeedSummaryProps {
+ feed: FeedOrListRespModel
+
+ analytics?: {
+ updatesPerWeek: number | null
+ subscriptionCount: number | null
+ latestEntryPublishedAt: string | null
+ }
+
+ showAnalytics?: boolean
+}
+export const FeedSummary: FC = ({ feed, analytics, showAnalytics = true }) => {
+ const { t } = useTranslation()
+ const numberFormatter = useMemo(() => new Intl.NumberFormat("en-US", {}), [])
+ return (
+
+
+
+ {showAnalytics && (
+
+ {!analytics ? (
+
+ ) : (
+
+ {!!analytics?.subscriptionCount && (
+
+
+
+
+ {numberFormatter.format(analytics.subscriptionCount)}{" "}
+ {t("feed.follower", { count: analytics.subscriptionCount })}
+
+
+ )}
+ {analytics?.updatesPerWeek ? (
+
+
+ {t("feed.entry_week", { count: analytics.updatesPerWeek ?? 0 })}
+
+ ) : analytics?.latestEntryPublishedAt ? (
+
+
+ {t("feed.updated_at")}
+
+
+ ) : null}
+
+ )}
+
+ )}
+
+ )
+}
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-form.tsx b/apps/desktop/layer/renderer/src/modules/discover/InboxForm.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-form.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/InboxForm.tsx
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-table.electron.tsx b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.electron.tsx
similarity index 96%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-table.electron.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/InboxTable.electron.tsx
index 6aa207451..2f7e86ae1 100644
--- a/apps/desktop/src/renderer/src/modules/discover/inbox-table.electron.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.electron.tsx
@@ -13,7 +13,7 @@ import { useTranslation } from "react-i18next"
import { useInboxList } from "~/queries/inboxes"
import { useInboxById } from "~/store/inbox"
-import { InboxActions, InboxEmail, InboxSecret } from "./inbox-table.shared"
+import { InboxActions, InboxEmail, InboxSecret } from "./InboxTable.shared"
export const InboxTable = () => {
const { t } = useTranslation()
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-table.mobile.tsx b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.mobile.tsx
similarity index 93%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-table.mobile.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/InboxTable.mobile.tsx
index ce1708d39..556d4374a 100644
--- a/apps/desktop/src/renderer/src/modules/discover/inbox-table.mobile.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.mobile.tsx
@@ -4,7 +4,7 @@ import { memo } from "react"
import { useInboxList } from "~/queries/inboxes"
import { useInboxById } from "~/store/inbox"
-import { InboxActions, InboxEmail, InboxSecret } from "./inbox-table.shared"
+import { InboxActions, InboxEmail, InboxSecret } from "./InboxTable.shared"
export const InboxTable = () => {
const inboxes = useInboxList()
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-table.shared.tsx b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.shared.tsx
similarity index 98%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-table.shared.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/InboxTable.shared.tsx
index 6425e65a7..ddcdc1139 100644
--- a/apps/desktop/src/renderer/src/modules/discover/inbox-table.shared.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.shared.tsx
@@ -11,7 +11,7 @@ import { createErrorToaster } from "~/lib/error-parser"
import { inboxActions } from "~/store/inbox"
import { subscriptionActions } from "~/store/subscription"
-import { InboxForm } from "./inbox-form"
+import { InboxForm } from "./InboxForm"
export const InboxEmail = ({ id }: { id: string }) => {
return (
diff --git a/apps/desktop/src/renderer/src/modules/discover/inbox-table.tsx b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.tsx
similarity index 58%
rename from apps/desktop/src/renderer/src/modules/discover/inbox-table.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/InboxTable.tsx
index 4befbf489..53e622492 100644
--- a/apps/desktop/src/renderer/src/modules/discover/inbox-table.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/InboxTable.tsx
@@ -1,7 +1,7 @@
import { withResponsiveSyncComponent } from "@follow/components/utils/selector.js"
-import { InboxTable as InboxTableDesktop } from "./inbox-table.electron"
-import { InboxTable as InboxTableMobile } from "./inbox-table.mobile"
+import { InboxTable as InboxTableDesktop } from "./InboxTable.electron"
+import { InboxTable as InboxTableMobile } from "./InboxTable.mobile"
export const InboxTable = withResponsiveSyncComponent(
InboxTableDesktop,
diff --git a/apps/desktop/src/renderer/src/modules/discover/list-form.tsx b/apps/desktop/layer/renderer/src/modules/discover/ListForm.tsx
similarity index 100%
rename from apps/desktop/src/renderer/src/modules/discover/list-form.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/ListForm.tsx
diff --git a/apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx b/apps/desktop/layer/renderer/src/modules/discover/RecommendationCard.tsx
similarity index 85%
rename from apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx
rename to apps/desktop/layer/renderer/src/modules/discover/RecommendationCard.tsx
index cd8fcb8b0..14c88f53a 100644
--- a/apps/desktop/src/renderer/src/modules/discover/recommendations-card.tsx
+++ b/apps/desktop/layer/renderer/src/modules/discover/RecommendationCard.tsx
@@ -1,5 +1,7 @@
import { Card, CardContent, CardHeader, CardTitle } from "@follow/components/ui/card/index.jsx"
-import { getDominantColor } from "@follow/utils/color"
+import { SiteIcon } from "@follow/components/ui/icon/SiteIcon.js"
+import { RSSHubCategories } from "@follow/constants"
+import { getHighestWeightColor } from "@follow/utils/color"
import { clsx, cn, getUrlIcon } from "@follow/utils/utils"
import { upperFirst } from "es-toolkit/compat"
import type { FC } from "react"
@@ -9,9 +11,7 @@ import { useTranslation } from "react-i18next"
import { useModalStack } from "~/components/ui/modal/stacked/hooks"
import { FeedIcon } from "~/modules/feed/feed-icon"
-import { RSSHubCategories } from "./constants"
-import { RecommendationContent } from "./recommendation-content"
-import styles from "./recommendations.module.css"
+import { RecommendationContent } from "./RecommendationContent"
import type { RSSHubRouteDeclaration } from "./types"
interface RecommendationCardProps {
@@ -44,7 +44,7 @@ export const RecommendationCard: FC = memo(
}, [data])
return (
-
+
@@ -55,21 +55,21 @@ export const RecommendationCard: FC = memo(
-
+
{data.name}
-
+
{Object.keys(data.routes).map((route) => {
const routeData = data.routes[route]!
// some routes have multiple paths, like `huxiu`
@@ -87,7 +87,7 @@ export const RecommendationCard: FC = memo(
>