,
) => (
-
+
-
+
),
)
diff --git a/apps/renderer/src/components/ui/modal/stacked/provider.tsx b/apps/renderer/src/components/ui/modal/stacked/provider.tsx
index 97996ba11..076fcec21 100644
--- a/apps/renderer/src/components/ui/modal/stacked/provider.tsx
+++ b/apps/renderer/src/components/ui/modal/stacked/provider.tsx
@@ -2,12 +2,8 @@ import { AnimatePresence } from "framer-motion"
import { useAtomValue } from "jotai"
import type { FC, PropsWithChildren } from "react"
-import { useUISettingKey } from "~/atoms/settings/ui"
-
import { modalStackAtom } from "./atom"
-import { MODAL_STACK_Z_INDEX } from "./constants"
import { ModalInternal } from "./modal"
-import { ModalOverlay } from "./overlay"
export const ModalStackProvider: FC
= ({ children }) => (
<>
@@ -19,11 +15,6 @@ export const ModalStackProvider: FC = ({ children }) => (
const ModalStack = () => {
const stack = useAtomValue(modalStackAtom)
- const modalSettingOverlay = useUISettingKey("modalOverlay")
-
- const forceOverlay = stack.some((item) => item.overlay)
- const allForceHideOverlay = stack.every((item) => item.overlay === false)
-
const topModalIndex = stack.findLastIndex((item) => item.modal)
const overlayIndex = stack.findLastIndex((item) => item.overlay || item.modal)
const overlayOptions = stack[overlayIndex]?.overlayOptions
@@ -35,15 +26,9 @@ const ModalStack = () => {
item={item}
index={index * 2}
isTop={index === topModalIndex * 2}
+ overlayOptions={overlayOptions}
/>
))}
- {stack.length > 0 && (modalSettingOverlay || forceOverlay) && !allForceHideOverlay && (
-
- )}
)
}
diff --git a/apps/renderer/src/components/ui/select.tsx b/apps/renderer/src/components/ui/select.tsx
index 7fd0af8b5..b4261c1d0 100644
--- a/apps/renderer/src/components/ui/select.tsx
+++ b/apps/renderer/src/components/ui/select.tsx
@@ -71,7 +71,7 @@ const SelectContent = React.forwardRef<
tag !== "img" && tag !== "picture",
)
} else {
- rehypeSchema.tagNames = [...rehypeSchema.tagNames!, "video", "style"]
+ rehypeSchema.tagNames = [...rehypeSchema.tagNames!, "video", "style", "figure"]
rehypeSchema.attributes = {
...rehypeSchema.attributes,
"*": renderInlineStyle
@@ -181,7 +181,7 @@ export const parseHtml = (
? propsChildren.find((i) => i.type === "code")
: propsChildren
- if (!children) return null
+ if (!children) return createElement("pre", props, props.children)
if (
"type" in children &&
@@ -191,7 +191,7 @@ export const parseHtml = (
language = children.props.className.replace("language-", "")
}
const code = "props" in children && children.props.children
- if (!code) return null
+ if (!code) createElement("pre", props, props.children)
try {
codeString = extractCodeFromHtml(renderToString(code))
@@ -203,7 +203,7 @@ export const parseHtml = (
}
}
- if (!codeString) return null
+ if (!codeString) return createElement("pre", props, props.children)
return createElement(ShikiHighLighter, {
code: codeString.trimEnd(),
diff --git a/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx b/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx
index aae1a9016..10d3fbae8 100644
--- a/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx
+++ b/apps/renderer/src/modules/discover/DiscoverFeedForm.tsx
@@ -22,6 +22,7 @@ import {
SelectTrigger,
SelectValue,
} from "~/components/ui/select"
+import { EllipsisHorizontalTextWithTooltip } from "~/components/ui/typography"
import { nextFrame } from "~/lib/dom"
import type { FeedViewType } from "~/lib/enum"
import {
@@ -84,16 +85,28 @@ const FeedDescription = ({ description }: { description?: string }) => {
)
}
+const routeParamsKeyPrefix = "route-params-"
+
+export type RouteParams = Record<
+ string,
+ {
+ description: string
+ default?: string
+ }
+>
+
export const DiscoverFeedForm = ({
route,
routePrefix,
noDescription,
submitButtonClassName,
+ routeParams,
}: {
route: RSSHubRoute
routePrefix: string
noDescription?: boolean
submitButtonClassName?: string
+ routeParams?: RouteParams
}) => {
const { t } = useTranslation()
const keys = useMemo(
@@ -121,13 +134,22 @@ export const DiscoverFeedForm = ({
() =>
z.object({
...Object.fromEntries(
- keys.map((keyItem) => [
- keyItem.name,
- keyItem.optional ? z.string().optional().nullable() : z.string().min(1),
- ]),
+ 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],
+ [keys, routeParams],
)
const defaultValue = useMemo(() => {
@@ -150,10 +172,30 @@ export const DiscoverFeedForm = ({
const { present, dismissAll } = useModalStack()
const onSubmit = useCallback(
- (data: Record) => {
+ (_data: Record) => {
+ const data = Object.fromEntries(
+ Object.entries(_data).filter(([key]) => !key.startsWith(routeParamsKeyPrefix)),
+ )
+
try {
- const fillRegexpPath = regexpPathToPath(route.path, data)
+ 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
+
const defaultView = getViewFromRoute(route) || (getSidebarActiveView() as FeedViewType)
present({
@@ -161,7 +203,7 @@ export const DiscoverFeedForm = ({
content: () => (
(null)
@@ -259,6 +301,26 @@ export const DiscoverFeedForm = ({
)
})}
+ {routeParams && (
+
+ {Object.entries(routeParams).map(([key, value]) => (
+
+ {key}
+
+ {!!value.description && (
+
+
+ {value.description}
+
+
+ )}
+
+ ))}
+
+ )}
{!noDescription && (
<>
diff --git a/apps/renderer/src/modules/discover/feed-form.tsx b/apps/renderer/src/modules/discover/feed-form.tsx
index 51db60284..d43088c31 100644
--- a/apps/renderer/src/modules/discover/feed-form.tsx
+++ b/apps/renderer/src/modules/discover/feed-form.tsx
@@ -244,7 +244,7 @@ const FeedInnerForm = ({
onSuccess?.()
},
- async onError(err) {
+ onError(err) {
toastFetchError(err)
},
})
diff --git a/apps/renderer/src/modules/discover/transform-form.tsx b/apps/renderer/src/modules/discover/transform-form.tsx
new file mode 100644
index 000000000..1c1f9ae99
--- /dev/null
+++ b/apps/renderer/src/modules/discover/transform-form.tsx
@@ -0,0 +1,77 @@
+import { LoadingCircle } from "~/components/ui/loading"
+import { useAuthQuery } from "~/hooks/common"
+import { Queries } from "~/queries"
+
+import type { RouteParams } from "./DiscoverFeedForm"
+import { DiscoverFeedForm } from "./DiscoverFeedForm"
+
+const transformRouteParams: RouteParams = {
+ title: { description: "The title of the RSS", default: "Extract from " },
+ item: { description: "The HTML elements as item using CSS selector", default: "html" },
+ itemTitle: {
+ description: "The HTML elements as title in item using CSS selector",
+ default: "item element",
+ },
+ itemTitleAttr: {
+ description: "The attributes of title element as title",
+ default: "Element text",
+ },
+ itemLink: {
+ description: "The HTML elements as link in item using CSS selector",
+ default: "item element",
+ },
+ itemLinkAttr: { description: "The attributes of link element as link", default: "href" },
+ itemDesc: {
+ description: "The HTML elements as description in item using CSS selector",
+ default: "item element",
+ },
+ itemDescAttr: {
+ description: "The attributes of description element as description",
+ default: "Element html",
+ },
+ itemPubDate: {
+ description: "The HTML elements as pubDate in item using CSS selector",
+ default: "item element",
+ },
+ itemPubDateAttr: {
+ description: "The attributes of pubDate element as pubDate",
+ default: "Element html",
+ },
+}
+
+export function DiscoverTransform() {
+ const { data, isLoading } = useAuthQuery(
+ Queries.discover.rsshubNamespace({
+ namespace: "rsshub",
+ }),
+ {
+ meta: {
+ persist: true,
+ },
+ },
+ )
+
+ if (isLoading) {
+ return (
+ <div className="center mt-12 flex w-full flex-col gap-8">
+ <LoadingCircle size="large" />
+ </div>
+ )
+ }
+
+ return (
+ <>
+ {data?.rsshub.routes && (
+ <div className="w-[512px]">
+ <DiscoverFeedForm
+ routePrefix="rsshub"
+ route={data?.rsshub.routes["/transform/html/:url/:routeParams"]}
+ routeParams={transformRouteParams}
+ noDescription
+ submitButtonClassName="justify-center"
+ />
+ </div>
+ )}
+ </>
+ )
+}
diff --git a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx b/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx
index 961457973..f5cf45876 100644
--- a/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx
+++ b/apps/renderer/src/modules/entry-column/components/mark-all-button.tsx
@@ -9,7 +9,7 @@ import { useOnClickOutside } from "usehooks-ts"
import { ActionButton, Button, IconButton } from "~/components/ui/button"
import { Kbd, KbdCombined } from "~/components/ui/kbd/Kbd"
import { RootPortal } from "~/components/ui/portal"
-import { ElECTRON_CUSTOM_TITLEBAR_HEIGHT, HotKeyScopeMap } from "~/constants"
+import { ElECTRON_CUSTOM_TITLEBAR_HEIGHT, HotKeyScopeMap, isElectronBuild } from "~/constants"
import { shortcuts } from "~/constants/shortcuts"
import { useI18n } from "~/hooks/common"
import { cn, getOS } from "~/lib/utils"
@@ -51,7 +51,9 @@ export const MarkAllReadWithOverlay = forwardRef<
<m.div
ref={setPopoverRef}
initial={{ y: -70 }}
- animate={{ y: getOS() === "Windows" ? -ElECTRON_CUSTOM_TITLEBAR_HEIGHT : 0 }}
+ animate={{
+ y: isElectronBuild && getOS() === "Windows" ? -ElECTRON_CUSTOM_TITLEBAR_HEIGHT : 0,
+ }}
exit={{ y: -70 }}
transition={{ type: "spring", damping: 20, stiffness: 300 }}
className="shadow-modal absolute z-50 bg-theme-modal-background-opaque shadow"
diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx
index c76d45653..d079cec84 100644
--- a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx
+++ b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx
@@ -261,7 +261,9 @@ const WideModeButton = () => {
: t("entry_list_header.switch_to_normalmode")
}
>
- <i className={cn(!isWideMode ? "i-mgc-align-justify-cute-re" : "i-mgc-layout-4-cute-re")} />
+ <i
+ className={cn(isWideMode ? "i-mgc-align-justify-cute-re" : "i-mgc-align-left-cute-re")}
+ />
</ActionButton>
</ImpressionView>
)
diff --git a/apps/renderer/src/modules/entry-content/components/EntryPlaceholderLogo.tsx b/apps/renderer/src/modules/entry-content/components/EntryPlaceholderLogo.tsx
index f210a4f6f..829d6b8bd 100644
--- a/apps/renderer/src/modules/entry-content/components/EntryPlaceholderLogo.tsx
+++ b/apps/renderer/src/modules/entry-content/components/EntryPlaceholderLogo.tsx
@@ -14,12 +14,12 @@ export const EntryPlaceholderLogo = () => {
<div
onContextMenu={stopPropagation}
className={cn(
- "flex w-full min-w-0 flex-col items-center justify-center gap-1 text-balance px-12 pb-6 text-center text-lg font-medium text-zinc-400 duration-500",
+ "flex w-full min-w-0 flex-col items-center justify-center gap-1 px-12 pb-6 text-center text-lg font-medium text-zinc-400 duration-500",
!logoShow && "translate-y-[-50px] opacity-0",
)}
>
<Logo className="size-16 opacity-40 grayscale" />
- <span className="max-w-[60ch]">{title}</span>
+ <div className="line-clamp-3 w-[60ch] max-w-full">{title}</div>
</div>
)
}
diff --git a/apps/renderer/src/modules/feed-column/category.tsx b/apps/renderer/src/modules/feed-column/category.tsx
index 34e90892e..b304abbee 100644
--- a/apps/renderer/src/modules/feed-column/category.tsx
+++ b/apps/renderer/src/modules/feed-column/category.tsx
@@ -17,7 +17,11 @@ import { showNativeMenu } from "~/lib/native-menu"
import { cn, sortByAlphabet } from "~/lib/utils"
import { getPreferredTitle, useAddFeedToFeedList, useFeedStore } from "~/store/feed"
import { useOwnedList } from "~/store/list"
-import { subscriptionActions, useSubscriptionByFeedId } from "~/store/subscription"
+import {
+ subscriptionActions,
+ subscriptionCategoryExist,
+ useSubscriptionByFeedId,
+} from "~/store/subscription"
import { useFeedUnreadStore } from "~/store/unread"
import { useModalStack } from "../../components/ui/modal/stacked/hooks"
@@ -219,7 +223,8 @@ function FeedCategoryImpl({ data: ids, view, categoryOpenStateData }: FeedCatego
{
type: "text",
label: t("sidebar.feed_column.context_menu.delete_category"),
- click: async () => {
+ hide: !folderName || !subscriptionCategoryExist(folderName),
+ click: () => {
present({
title: t("sidebar.feed_column.context_menu.delete_category_confirmation", {
folderName,
diff --git a/apps/renderer/src/modules/feed-column/list.tsx b/apps/renderer/src/modules/feed-column/list.tsx
index f187a3266..517c5d952 100644
--- a/apps/renderer/src/modules/feed-column/list.tsx
+++ b/apps/renderer/src/modules/feed-column/list.tsx
@@ -139,6 +139,7 @@ function FeedListImpl({ className, view }: { className?: string; view: number })
className="font-bold"
onClick={(e) => {
e.stopPropagation()
+ if (!document.hasFocus()) return
if (view !== undefined) {
navigateEntry({
entryId: null,
diff --git a/apps/renderer/src/modules/panel/cmdf.tsx b/apps/renderer/src/modules/panel/cmdf.tsx
index 2d00095ed..4b4577e18 100644
--- a/apps/renderer/src/modules/panel/cmdf.tsx
+++ b/apps/renderer/src/modules/panel/cmdf.tsx
@@ -9,6 +9,7 @@ import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react
import { useDebounceCallback, useEventCallback } from "usehooks-ts"
import { softSpringPreset } from "~/components/ui/constants/spring"
+import { RootPortal } from "~/components/ui/portal"
import { useInputComposition, useRefValue } from "~/hooks/common"
import { tipcClient } from "~/lib/client"
import { nextFrame } from "~/lib/dom"
@@ -117,7 +118,7 @@ const CmdFImpl: FC<{
e.preventDefault()
nativeSearch(value)
}}
- className="center shadow-perfect fixed right-8 top-12 z-[1000] size-9 w-64 gap-2 rounded-2xl border bg-zinc-50/90 pl-3 pr-2 backdrop-blur duration-200 focus-within:border-accent dark:bg-neutral-800/80"
+ className="center shadow-perfect fixed right-8 top-12 size-9 w-64 gap-2 rounded-2xl border bg-zinc-50/90 pl-3 pr-2 backdrop-blur duration-200 focus-within:border-accent dark:bg-neutral-800/80"
>
<div className="relative h-full grow">
<input
@@ -238,22 +239,24 @@ export const CmdF = () => {
setShow(true)
})
return (
- <AnimatePresence>
- {show && (
- <m.div
- className="relative z-[1000]"
- initial={{ opacity: 0.8, y: -150 }}
- animate={{ opacity: 1, y: 0 }}
- exit={{ opacity: 0, y: -150 }}
- transition={softSpringPreset}
- >
- <CmdFImpl
- onClose={() => {
- setShow(false)
- }}
- />
- </m.div>
- )}
- </AnimatePresence>
+ <RootPortal>
+ <AnimatePresence>
+ {show && (
+ <m.div
+ className="fixed top-0 w-full"
+ initial={{ opacity: 0.8, y: -150 }}
+ animate={{ opacity: 1, y: 0 }}
+ exit={{ opacity: 0, y: -150 }}
+ transition={softSpringPreset}
+ >
+ <CmdFImpl
+ onClose={() => {
+ setShow(false)
+ }}
+ />
+ </m.div>
+ )}
+ </AnimatePresence>
+ </RootPortal>
)
}
diff --git a/apps/renderer/src/modules/power/transaction-section/index.tsx b/apps/renderer/src/modules/power/transaction-section/index.tsx
index 104a9c14f..ea3cd63d2 100644
--- a/apps/renderer/src/modules/power/transaction-section/index.tsx
+++ b/apps/renderer/src/modules/power/transaction-section/index.tsx
@@ -56,7 +56,7 @@ export const TransactionsSection: Component = ({ className }) => {
</Tabs>
<div className={cn("w-fit min-w-0 grow overflow-x-auto", className)}>
<Table className="w-full table-fixed">
- <TableHeader className="sticky top-0 z-10 bg-theme-background">
+ <TableHeader className="sticky top-0 bg-theme-background">
<TableRow className="[&_*]:!pl-0 [&_*]:!font-semibold">
<TableHead>{t("wallet.transactions.type")}</TableHead>
<TableHead>{t("wallet.transactions.amount")}</TableHead>
diff --git a/apps/renderer/src/modules/profile/user-profile-modal.tsx b/apps/renderer/src/modules/profile/user-profile-modal.tsx
index 0b4e39696..076e83d6c 100644
--- a/apps/renderer/src/modules/profile/user-profile-modal.tsx
+++ b/apps/renderer/src/modules/profile/user-profile-modal.tsx
@@ -397,7 +397,7 @@ const SubscriptionItem: FC<{
!isLoose && "flex items-center",
)}
>
- <div className="truncate font-medium leading-none">{subscription.feeds?.title}</div>
+ <div className="truncate font-medium leading-tight">{subscription.feeds?.title}</div>
{isLoose && (
<div className="mt-1 line-clamp-1 text-xs text-zinc-500">
{subscription.feeds?.description}
diff --git a/apps/renderer/src/modules/wallet/tip-modal.tsx b/apps/renderer/src/modules/wallet/tip-modal.tsx
index 73e7a9c4e..7c713e9db 100644
--- a/apps/renderer/src/modules/wallet/tip-modal.tsx
+++ b/apps/renderer/src/modules/wallet/tip-modal.tsx
@@ -1,6 +1,7 @@
import { from } from "dnum"
import type { FC } from "react"
import { useState } from "react"
+import { useNavigate } from "react-router-dom"
import { Button } from "~/components/ui/button"
import { Divider } from "~/components/ui/divider"
@@ -14,7 +15,6 @@ import { UserAvatar } from "~/modules/user/UserAvatar"
import { useWallet, useWalletTipMutation } from "~/queries/wallet"
import { useFeedClaimModal } from "../claim"
-import { useSettingModal } from "../settings/modal/hooks-hack"
import { Balance } from "./balance"
const DEFAULT_RECOMMENDED_TIP = 10
@@ -65,12 +65,12 @@ const TipModalContent_: FC<{
const { dismiss } = useCurrentModal()
- const settingModalPresent = useSettingModal()
-
const claimFeed = useFeedClaimModal({
feedId,
})
+ const navigate = useNavigate()
+
if (myWallet.isPending) {
return <Loading />
}
@@ -80,7 +80,7 @@ const TipModalContent_: FC<{
<div className="flex w-[80vw] max-w-[350px] flex-col gap-5">
<p className="text-sm text-theme-foreground/80">{t("tip_modal.no_wallet")}</p>
<div className="flex justify-end">
- <Button variant="primary" onClick={() => nextFrame(() => settingModalPresent("wallet"))}>
+ <Button variant="primary" onClick={() => nextFrame(() => navigate("/power"))}>
{t("tip_modal.create_wallet")}
</Button>
</div>
diff --git a/apps/renderer/src/pages/(external)/(with-layout)/list/[id]/index.tsx b/apps/renderer/src/pages/(external)/(with-layout)/list/[id]/index.tsx
index 39875d9dd..4f8a324e8 100644
--- a/apps/renderer/src/pages/(external)/(with-layout)/list/[id]/index.tsx
+++ b/apps/renderer/src/pages/(external)/(with-layout)/list/[id]/index.tsx
@@ -50,7 +50,7 @@ export function Component() {
{t("feed.followsAndFeeds", {
subscriptionCount: list.data?.subscriptionCount,
subscriptionNoun: t("feed.follower", { count: list.data?.subscriptionCount }),
- feedsCount: "feedCount" in listData ? listData.feedCount : 0,
+ feedsCount: list.data?.feedCount || 0,
feedsNoun: t("feed.feeds", { count: listData?.feedIds?.length }),
appName: APP_NAME,
})}
diff --git a/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx b/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx
index 086be0b6e..e07c996c6 100644
--- a/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx
+++ b/apps/renderer/src/pages/(main)/(layer)/(subview)/discover/index.tsx
@@ -8,6 +8,7 @@ import { DiscoverImport } from "~/modules/discover/import"
import { DiscoverInboxList } from "~/modules/discover/inbox-list-form"
import { Recommendations } from "~/modules/discover/recommendations"
import { DiscoverRSS3 } from "~/modules/discover/rss3-form"
+import { DiscoverTransform } from "~/modules/discover/transform-form"
import { DiscoverUser } from "~/modules/discover/user-form"
import { Trend } from "~/modules/trending"
@@ -42,6 +43,10 @@ const tabs: {
name: "words.user",
value: "user",
},
+ {
+ name: "words.transform",
+ value: "transform",
+ },
{
name: "words.import",
value: "import",
@@ -93,4 +98,5 @@ const TabComponent: Record<string, React.FC<{ type?: string }>> = {
inbox: DiscoverInboxList,
user: DiscoverUser,
default: DiscoverForm,
+ transform: DiscoverTransform,
}
diff --git a/apps/renderer/src/pages/(main)/layout.tsx b/apps/renderer/src/pages/(main)/layout.tsx
index 0b7c472bb..76144111e 100644
--- a/apps/renderer/src/pages/(main)/layout.tsx
+++ b/apps/renderer/src/pages/(main)/layout.tsx
@@ -48,9 +48,9 @@ import { AppLayoutGridContainerProvider } from "~/providers/app-grid-layout-cont
const FooterInfo = () => {
const { t } = useTranslation()
return (
- <div className="relative">
+ <div className="relative !mt-0">
{APP_VERSION?.[0] === "0" && (
- <div className="pointer-events-none !mt-0 w-full py-3 text-center text-xs opacity-20">
+ <div className="pointer-events-none w-full py-3 text-center text-xs opacity-20">
{t("early_access")}{" "}
{GIT_COMMIT_SHA ? `(${GIT_COMMIT_SHA.slice(0, 7).toUpperCase()})` : ""}
</div>
@@ -123,10 +123,6 @@ export function Component() {
</AppErrorBoundary>
</main>
- <SearchCmdK />
- <CmdNTrigger />
- {ELECTRON && <CmdF />}
-
{isAuthFail && !user && (
<RootPortal>
<DeclarativeModal
@@ -141,6 +137,10 @@ export function Component() {
</DeclarativeModal>
</RootPortal>
)}
+
+ <SearchCmdK />
+ <CmdNTrigger />
+ {ELECTRON && <CmdF />}
</RootContainer>
)
}
@@ -155,7 +155,7 @@ const RootContainer = forwardRef<HTMLDivElement, PropsWithChildren>(({ children
"--fo-feed-col-w": `${feedColWidth}px`,
} as any
}
- className="flex h-screen overflow-hidden"
+ className="relative z-0 flex h-screen overflow-hidden"
onContextMenu={preventDefault}
>
{children}
diff --git a/apps/renderer/src/providers/app-grid-layout-container-provider.tsx b/apps/renderer/src/providers/app-grid-layout-container-provider.tsx
index 295d1ca22..bb2aa2570 100644
--- a/apps/renderer/src/providers/app-grid-layout-container-provider.tsx
+++ b/apps/renderer/src/providers/app-grid-layout-container-provider.tsx
@@ -28,7 +28,7 @@ export const AppLayoutGridContainerProvider: FC<PropsWithChildren> = ({ children
return (
<AppLayoutGridContainerWidthContext.Provider value={width}>
- <div ref={ref} className="contents">
+ <div ref={ref} className="relative z-0 contents">
{children}
</div>
</AppLayoutGridContainerWidthContext.Provider>
diff --git a/apps/renderer/src/providers/lazy/index.electron.ts b/apps/renderer/src/providers/lazy/index.electron.ts
new file mode 100644
index 000000000..50a081c33
--- /dev/null
+++ b/apps/renderer/src/providers/lazy/index.electron.ts
@@ -0,0 +1,5 @@
+export { ContextMenuProvider as LazyContextMenuProvider } from "../context-menu-provider"
+export { ExtensionExposeProvider as LazyExtensionExposeProvider } from "../extension-expose-provider"
+export { LottieRenderContainer as LazyLottieRenderContainer } from "~/components/ui/lottie-container"
+export { ModalStackProvider as LazyModalStackProvider } from "~/components/ui/modal"
+export { FeatureFlagDebugger as LazyFeatureFlagDebugger } from "~/modules/ab/providers"
diff --git a/apps/renderer/src/providers/lazy/index.ts b/apps/renderer/src/providers/lazy/index.ts
new file mode 100644
index 000000000..48d13bc5d
--- /dev/null
+++ b/apps/renderer/src/providers/lazy/index.ts
@@ -0,0 +1,35 @@
+import { lazy } from "react"
+
+const LazyLottieRenderContainer = lazy(() =>
+ import("../../components/ui/lottie-container").then((res) => ({
+ default: res.LottieRenderContainer,
+ })),
+)
+const LazyContextMenuProvider = lazy(() =>
+ import("./../context-menu-provider").then((res) => ({
+ default: res.ContextMenuProvider,
+ })),
+)
+const LazyModalStackProvider = lazy(() =>
+ import("../../components/ui/modal/stacked/provider").then((res) => ({
+ default: res.ModalStackProvider,
+ })),
+)
+
+const LazyExtensionExposeProvider = lazy(() =>
+ import("./../extension-expose-provider").then((res) => ({
+ default: res.ExtensionExposeProvider,
+ })),
+)
+const LazyFeatureFlagDebugger = lazy(() =>
+ import("../../modules/ab/providers").then((res) => ({
+ default: res.FeatureFlagDebugger,
+ })),
+)
+export {
+ LazyContextMenuProvider,
+ LazyExtensionExposeProvider,
+ LazyFeatureFlagDebugger,
+ LazyLottieRenderContainer,
+ LazyModalStackProvider,
+}
diff --git a/apps/renderer/src/providers/root-providers.tsx b/apps/renderer/src/providers/root-providers.tsx
index c8076f7c3..9b357e3a7 100644
--- a/apps/renderer/src/providers/root-providers.tsx
+++ b/apps/renderer/src/providers/root-providers.tsx
@@ -4,7 +4,7 @@ import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client
import { LazyMotion, MotionConfig } from "framer-motion"
import { Provider } from "jotai"
import type { FC, PropsWithChildren } from "react"
-import { lazy, Suspense } from "react"
+import { Suspense } from "react"
import { HotkeysProvider } from "react-hotkeys-hook"
import { Toaster } from "~/components/ui/sonner"
@@ -15,36 +15,18 @@ import { persistConfig, queryClient } from "~/lib/query-client"
import { EventProvider } from "./event-provider"
import { I18nProvider } from "./i18n-provider"
import { InvalidateQueryProvider } from "./invalidate-query-provider"
+import {
+ LazyContextMenuProvider,
+ LazyExtensionExposeProvider,
+ LazyFeatureFlagDebugger,
+ LazyLottieRenderContainer,
+ LazyModalStackProvider,
+ // specific import should add `index` postfix
+} from "./lazy/index"
import { SettingSync } from "./setting-sync"
import { StableRouterProvider } from "./stable-router-provider"
import { UserProvider } from "./user-provider"
-const LazyLottieRenderContainer = lazy(() =>
- import("../components/ui/lottie-container").then((res) => ({
- default: res.LottieRenderContainer,
- })),
-)
-const LazyContextMenuProvider = lazy(() =>
- import("./context-menu-provider").then((res) => ({
- default: res.ContextMenuProvider,
- })),
-)
-const LazyModalStackProvider = lazy(() =>
- import("../components/ui/modal/stacked/provider").then((res) => ({
- default: res.ModalStackProvider,
- })),
-)
-
-const LazyExtensionExposeProvider = lazy(() =>
- import("./extension-expose-provider").then((res) => ({
- default: res.ExtensionExposeProvider,
- })),
-)
-const LazyFeatureFlagDebugger = lazy(() =>
- import("../modules/ab/providers").then((res) => ({
- default: res.FeatureFlagDebugger,
- })),
-)
const loadFeatures = () => import("../framer-lazy-feature").then((res) => res.default)
export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
<LazyMotion features={loadFeatures} strict key="framer">
@@ -62,6 +44,13 @@ export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
<EventProvider />
<UserProvider />
+
+ <StableRouterProvider />
+ <SettingSync />
+
+ {import.meta.env.DEV && <Devtools />}
+ {children}
+
<Suspense>
<LazyExtensionExposeProvider />
<LazyModalStackProvider />
@@ -69,12 +58,6 @@ export const RootProviders: FC<PropsWithChildren> = ({ children }) => (
<LazyLottieRenderContainer />
<LazyFeatureFlagDebugger />
</Suspense>
-
- <StableRouterProvider />
- <SettingSync />
-
- {import.meta.env.DEV && <Devtools />}
- {children}
<Toaster />
</I18nProvider>
</Provider>
diff --git a/apps/renderer/src/queries/wallet.tsx b/apps/renderer/src/queries/wallet.tsx
index b954dc65e..89d24f9b2 100644
--- a/apps/renderer/src/queries/wallet.tsx
+++ b/apps/renderer/src/queries/wallet.tsx
@@ -1,11 +1,11 @@
import { useMutation } from "@tanstack/react-query"
+import { useNavigate } from "react-router-dom"
import { toast } from "sonner"
import { useAuthQuery } from "~/hooks/common"
import { apiClient } from "~/lib/api-fetch"
import { defineQuery } from "~/lib/defineQuery"
import { getFetchErrorMessage, toastFetchError } from "~/lib/error-parser"
-import { useSettingModal } from "~/modules/settings/modal/hooks"
export const wallet = {
get: ({ userId }: { userId?: string } = {}) =>
@@ -68,7 +68,7 @@ export const useClaimCheck = () =>
})
export const useClaimWalletDailyRewardMutation = () => {
- const settingModalPresent = useSettingModal()
+ const navigate = useNavigate()
return useMutation({
mutationKey: ["claimWalletDailyReward"],
@@ -82,10 +82,7 @@ export const useClaimWalletDailyRewardMutation = () => {
window.posthog?.capture("daily_reward_claimed")
toast(
- <div
- className="flex items-center gap-1 text-lg"
- onClick={() => settingModalPresent("wallet")}
- >
+ <div className="flex items-center gap-1 text-lg" onClick={() => navigate("/power")}>
<i className="i-mgc-power text-accent animate-flip" />
</div>,
{
diff --git a/apps/renderer/src/router.web.tsx b/apps/renderer/src/router.web.tsx
new file mode 100644
index 000000000..0bd90846b
--- /dev/null
+++ b/apps/renderer/src/router.web.tsx
@@ -0,0 +1,29 @@
+import { IN_ELECTRON } from "@follow/shared/constants"
+import { wrapCreateBrowserRouter } from "@sentry/react"
+import { createBrowserRouter, createHashRouter } from "react-router-dom"
+
+import { ErrorElement } from "./components/common/ErrorElement"
+import { NotFound } from "./components/common/NotFound"
+import { buildGlobRoutes } from "./lib/route-builder"
+
+const globTree = import.meta.glob("./pages/**/*.tsx")
+const tree = buildGlobRoutes(globTree)
+
+let routerCreator =
+ IN_ELECTRON || globalThis["__DEBUG_PROXY__"] ? createHashRouter : createBrowserRouter
+if (window.SENTRY_RELEASE) {
+ routerCreator = wrapCreateBrowserRouter(routerCreator)
+}
+
+export const router = routerCreator([
+ {
+ path: "/",
+ lazy: () => import("./App"),
+ children: tree,
+ errorElement: <ErrorElement />,
+ },
+ {
+ path: "*",
+ element: <NotFound />,
+ },
+])
diff --git a/apps/renderer/src/store/entry/helper.ts b/apps/renderer/src/store/entry/helper.ts
index a211cfb62..81618116d 100644
--- a/apps/renderer/src/store/entry/helper.ts
+++ b/apps/renderer/src/store/entry/helper.ts
@@ -7,9 +7,6 @@ import { useSubscriptionStore } from "../subscription"
import { useEntryStore } from "./store"
import type { EntryFilter } from "./types"
-type EntryId = string
-type FeedId = string
-
export const getFilteredFeedIds = (feedIds: string[], filter?: EntryFilter) => {
const state = useEntryStore.getState()
const ids = [] as string[]
@@ -33,11 +30,18 @@ export const getFilteredFeedIds = (feedIds: string[], filter?: EntryFilter) => {
}
const unread = create({
- fetcher: async (ids: ([FeedId, EntryId, boolean] | [FeedId, EntryId])[]) => {
+ fetcher: async (
+ ids: {
+ entryId: string
+ isInbox: boolean
+ isPrivate?: boolean
+ }[],
+ ) => {
await apiClient.reads.$post({
json: {
- entryIds: ids.map((i) => i[1]),
- isInbox: ids[0][2],
+ entryIds: ids.map((i) => i.entryId),
+ isInbox: ids[0].isInbox,
+ readHistories: ids.filter((i) => !i.isPrivate).map((i) => i.entryId),
},
})
diff --git a/apps/renderer/src/store/entry/store.ts b/apps/renderer/src/store/entry/store.ts
index 52fe53e40..b290137cd 100644
--- a/apps/renderer/src/store/entry/store.ts
+++ b/apps/renderer/src/store/entry/store.ts
@@ -11,6 +11,7 @@ import { EntryService } from "~/services"
import { feedActions } from "../feed"
import { imageActions } from "../image"
import { inboxActions } from "../inbox"
+import { getSubscriptionByFeedId } from "../subscription"
import { feedUnreadActions } from "../unread"
import { createZustandStore, doMutationAndTransaction } from "../utils/helper"
import { internal_batchMarkRead } from "./helper"
@@ -349,6 +350,7 @@ class EntryActions {
async markRead({ feedId, entryId, read }: { feedId: string; entryId: string; read: boolean }) {
const entry = get().flatMapEntries[entryId]
const isInbox = entry?.entries && "inboxHandle" in entry.entries
+ const subscription = getSubscriptionByFeedId(feedId)
if (read && entry?.read) {
return
@@ -364,7 +366,11 @@ class EntryActions {
// Send api request
async () => {
if (read) {
- await internal_batchMarkRead([feedId, entryId, isInbox])
+ await internal_batchMarkRead({
+ entryId,
+ isInbox,
+ isPrivate: subscription?.isPrivate,
+ })
} else {
await apiClient.reads.$delete({
json: {
diff --git a/apps/renderer/src/store/subscription/hooks.ts b/apps/renderer/src/store/subscription/hooks.ts
index 748fee22e..f69a4d340 100644
--- a/apps/renderer/src/store/subscription/hooks.ts
+++ b/apps/renderer/src/store/subscription/hooks.ts
@@ -1,7 +1,7 @@
import { FEED_COLLECTION_LIST, ROUTE_FEED_IN_FOLDER } from "~/constants"
import { FeedViewType } from "~/lib/enum"
-import { useSubscriptionStore } from "../subscription"
+import { subscriptionCategoryExistSelector, useSubscriptionStore } from "../subscription"
type FeedId = string
export const useFeedIdByView = (view: FeedViewType) =>
@@ -64,3 +64,6 @@ export const useFeedSubscriptionCount = () =>
(s) => !!s.feedId && !s.listId && !s.inboxId && state.subscriptionIdSet.has(s.feedId),
).length,
)
+
+export const useSubscriptionCategoryExist = (name: string) =>
+ useSubscriptionStore(subscriptionCategoryExistSelector(name))
diff --git a/apps/renderer/src/store/subscription/index.ts b/apps/renderer/src/store/subscription/index.ts
index a1fdac565..6a6c423c6 100644
--- a/apps/renderer/src/store/subscription/index.ts
+++ b/apps/renderer/src/store/subscription/index.ts
@@ -1,2 +1,3 @@
export * from "./hooks"
+export * from "./selector"
export * from "./store"
diff --git a/apps/renderer/src/store/subscription/selector.ts b/apps/renderer/src/store/subscription/selector.ts
new file mode 100644
index 000000000..a0fbadbf2
--- /dev/null
+++ b/apps/renderer/src/store/subscription/selector.ts
@@ -0,0 +1,5 @@
+import type { useSubscriptionStore } from "./store"
+
+type State = ReturnType<typeof useSubscriptionStore.getState>
+export const subscriptionCategoryExistSelector = (name: string) => (state: State) =>
+ state.categories.has(name)
diff --git a/apps/renderer/src/store/subscription/store.ts b/apps/renderer/src/store/subscription/store.ts
index 508c4cc6e..a218d85b0 100644
--- a/apps/renderer/src/store/subscription/store.ts
+++ b/apps/renderer/src/store/subscription/store.ts
@@ -17,6 +17,7 @@ import { inboxActions } from "../inbox"
import { listActions } from "../list"
import { feedUnreadActions } from "../unread"
import { createImmerSetter, createZustandStore, doMutationAndTransaction } from "../utils/helper"
+import { subscriptionCategoryExistSelector } from "./selector"
export type SubscriptionFlatModel = Omit<SubscriptionModel, "feeds"> & {
defaultCategory?: string
@@ -41,7 +42,11 @@ interface SubscriptionState {
*/
categoryOpenStateByView: Record<FeedViewType, Record<string, boolean>>
/**
- * Store the subscription ids that current user followed.
+ * All named categories names set
+ */
+ categories: Set<string>
+ /**
+ * All subscription ids set
*/
subscriptionIdSet: Set<string>
}
@@ -90,7 +95,8 @@ export const useSubscriptionStore = createZustandStore<SubscriptionState>("subsc
data: {},
feedIdByView: { ...emptyDataIdByView },
categoryOpenStateByView: { ...emptyCategoryOpenStateByView },
- subscriptionIdSet: new Set<string>(),
+ categories: new Set(),
+ subscriptionIdSet: new Set(),
}))
const set = useSubscriptionStore.setState
@@ -118,6 +124,19 @@ class SubscriptionActions {
})
}
})
+
+ useSubscriptionStore.subscribe((state, prev) => {
+ if (state.data === prev.data) return
+
+ const categories = new Set<string>()
+ for (const subscription of Object.values(state.data)) {
+ subscription.category && categories.add(subscription.category)
+ }
+ set((state) => ({
+ ...state,
+ categories,
+ }))
+ })
}
async fetchByView(view?: FeedViewType) {
const res = await apiClient.subscriptions.$get({
@@ -453,7 +472,6 @@ class SubscriptionActions {
}),
async () =>
// Db
-
SubscriptionService.renameCategory(whoami()!.id, subscriptionIds, newCategory),
)
}
@@ -472,3 +490,6 @@ export const isListSubscription = (feedId?: FeedId) => {
if (!subscription) return false
return "listId" in subscription && !!subscription.listId
}
+
+export const subscriptionCategoryExist = (name: string) =>
+ subscriptionCategoryExistSelector(name)(get())
diff --git a/changelogithub.config.ts b/changelogithub.config.ts
index 40322ada1..726e583e3 100644
--- a/changelogithub.config.ts
+++ b/changelogithub.config.ts
@@ -1,4 +1,4 @@
export default {
tagFilter: (tag: string) => tag.startsWith("v") && !tag.includes("nightly"),
- dry: true,
+ dry: !process.env.CI,
}
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index 200a59db6..7d159b193 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -3,6 +3,7 @@ import { resolve } from "node:path"
import { defineConfig } from "electron-vite"
import { viteRenderBaseConfig } from "./configs/vite.render.config"
+import { createPlatformSpecificImportPlugin } from "./plugins/vite/specific-import"
export default defineConfig({
main: {
@@ -41,6 +42,8 @@ export default defineConfig({
renderer: {
...viteRenderBaseConfig,
+ plugins: [...viteRenderBaseConfig.plugins, createPlatformSpecificImportPlugin(true)],
+
root: "apps/renderer",
build: {
outDir: "dist/renderer",
diff --git a/forge.config.ts b/forge.config.ts
index e579a2809..3eea4a775 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -154,6 +154,7 @@ const config: ForgeConfig = {
new MakerSquirrel({
name: "Follow",
setupIcon: "resources/icon.ico",
+ iconUrl: "https://app.follow.is/favicon.ico",
}),
new MakerAppImage({
options: {
diff --git a/locales/app/en.json b/locales/app/en.json
index 3587f6756..76c64a96d 100644
--- a/locales/app/en.json
+++ b/locales/app/en.json
@@ -287,6 +287,7 @@
"words.search": "Search",
"words.starred": "Starred",
"words.title": "Title",
+ "words.transform": "Transform",
"words.trending": "Trending",
"words.undo": "Undo",
"words.unread": "Unread",
diff --git a/locales/app/zh-HK.json b/locales/app/zh-HK.json
index a4d0646de..509e3234e 100644
--- a/locales/app/zh-HK.json
+++ b/locales/app/zh-HK.json
@@ -54,9 +54,9 @@
"entry_actions.copied_notify": "{{which}}已複製到剪貼板",
"entry_actions.copy_link": "複製連結",
"entry_actions.copy_title": "複製標題",
- "entry_actions.failed_to_save_to_eagle": "無法保存至 Eagle。",
- "entry_actions.failed_to_save_to_instapaper": "無法保存至 Instapaper。",
- "entry_actions.failed_to_save_to_readwise": "無法保存至 Readwise。",
+ "entry_actions.failed_to_save_to_eagle": "無法保存至 Eagle",
+ "entry_actions.failed_to_save_to_instapaper": "無法保存至 Instapaper",
+ "entry_actions.failed_to_save_to_readwise": "無法保存至 Readwise",
"entry_actions.mark_as_read": "標記為已讀",
"entry_actions.mark_as_unread": "標記為未讀",
"entry_actions.open_in_browser": "在{{which}}中開啟",
@@ -64,17 +64,17 @@
"entry_actions.save_media_to_eagle": "保存媒體至 Eagle",
"entry_actions.save_to_instapaper": "保存至 Instapaper",
"entry_actions.save_to_readwise": "保存至 Readwise",
- "entry_actions.saved_to_eagle": "已保存至 Eagle。",
- "entry_actions.saved_to_instapaper": "已保存至 Instapaper。",
- "entry_actions.saved_to_readwise": "已保存至 Readwise。",
+ "entry_actions.saved_to_eagle": "已保存至 Eagle",
+ "entry_actions.saved_to_instapaper": "已保存至 Instapaper",
+ "entry_actions.saved_to_readwise": "已保存至 Readwise",
"entry_actions.share": "分享",
"entry_actions.star": "收藏",
- "entry_actions.starred": "已收藏。",
+ "entry_actions.starred": "已收藏",
"entry_actions.tip": "贊助",
"entry_actions.unstar": "取消收藏",
- "entry_actions.unstarred": "已取消收藏。",
+ "entry_actions.unstarred": "已取消收藏",
"entry_actions.view_source_content": "查看原始內容",
- "entry_column.filtered_content_tip": "你已隱藏篩選內容。",
+ "entry_column.filtered_content_tip": "你已隱藏篩選內容",
"entry_column.filtered_content_tip_2": "除了以上顯示的條目，還有一些已篩選的內容。",
"entry_column.refreshing": "刷新新條目中...",
"entry_content.ai_summary": "AI 摘要",
@@ -85,12 +85,12 @@
"entry_content.readability_notice": "此內容由 Readability 提供。如果你發現排版異常，請到來源網站查看原始內容。",
"entry_content.render_error": "渲染錯誤：",
"entry_content.report_issue": "報告問題",
- "entry_content.support_amount": "{{amount}} 人支持了此訂閱源的創作者。",
+ "entry_content.support_amount": "{{amount}} 人支持了此訂閱源的創作者",
"entry_content.support_creator": "支持創作者",
"entry_content.web_app_notice": "網頁應用可能不支持此內容類型。你可以下載桌面應用程式。",
"entry_list.zero_unread": "全部已讀",
"entry_list_header.daily_report": "每日報告",
- "entry_list_header.hide_no_image_items": "隱藏沒有圖片的條目。",
+ "entry_list_header.hide_no_image_items": "隱藏沒有圖片的條目",
"entry_list_header.items": "項目",
"entry_list_header.new_entries_available": "有新條目可用",
"entry_list_header.refetch": "重新抓取",
@@ -105,12 +105,12 @@
"entry_list_header.unread": "未讀",
"feed_claim_modal.choose_verification_method": "有三種驗證方法可選，你可以選擇其中一種進行驗證。",
"feed_claim_modal.claim_button": "認領",
- "feed_claim_modal.content_instructions": "複製以下內容並貼到你最新的 RSS 訂閱源中。",
+ "feed_claim_modal.content_instructions": "複製以下內容並貼到你最新的 RSS 訂閱源中",
"feed_claim_modal.description_current": "當前描述：",
- "feed_claim_modal.description_instructions": "複製以下內容並貼到你的 RSS 訂閱源中的 <code /> 欄位。",
+ "feed_claim_modal.description_instructions": "複製以下內容並貼到你的 RSS 訂閱源中的 <code /> 欄位",
"feed_claim_modal.failed_to_load": "無法加載認領信息",
"feed_claim_modal.rss_format_choice": "RSS 生成器通常有兩種格式可選。請根據需要複製以下的 XML 和 JSON 格式。",
- "feed_claim_modal.rss_instructions": "複製以下代碼並貼到你的 RSS 生成器中。",
+ "feed_claim_modal.rss_instructions": "複製以下代碼並貼到你的 RSS 生成器中",
"feed_claim_modal.rss_json_format": "JSON 格式",
"feed_claim_modal.rss_xml_format": "XML 格式",
"feed_claim_modal.rsshub_notice": "此訂閱源由 RSSHub 提供，緩存時間為 1 小時。發布內容後，請等待最多 1 小時更改才能生效。",
@@ -122,23 +122,23 @@
"feed_form.add_follow": "新增關注",
"feed_form.category": "分類",
"feed_form.category_description": "默認情況下，你的關注會按網站分組。",
- "feed_form.error_fetching_feed": "獲取訂閱源時出錯。",
+ "feed_form.error_fetching_feed": "獲取訂閱源時出錯",
"feed_form.fee": "跟隨費用",
"feed_form.fee_description": "要跟隨此清單，您必須向清單創建者支付費用。",
- "feed_form.feed_not_found": "未找到相關資訊流。",
+ "feed_form.feed_not_found": "未找到相關資訊流",
"feed_form.feedback": "反饋",
"feed_form.follow": "關注",
"feed_form.follow_with_fee": "跟隨需要 {{fee}} Power",
- "feed_form.followed": "🎉 已關注。",
+ "feed_form.followed": "🎉 已關注",
"feed_form.private_follow": "私人關注",
- "feed_form.private_follow_description": "此關注是否在你的個人資料頁面上公開可見。",
+ "feed_form.private_follow_description": "此關注是否在你的個人資料頁面上公開可見",
"feed_form.retry": "重試",
"feed_form.title": "標題",
"feed_form.title_description": "此資訊流的自定義標題。留空則使用默認標題。",
"feed_form.unfollow": "取消關注",
"feed_form.update": "更新",
"feed_form.update_follow": "更新關注",
- "feed_form.updated": "🎉 已更新。",
+ "feed_form.updated": "🎉 已更新",
"feed_form.view": "視圖",
"feed_item.claimed_by_owner": "訂閲源所有者",
"feed_item.claimed_by_unknown": "未知所有者",
@@ -152,7 +152,7 @@
"feed_view_type.pictures": "圖片",
"feed_view_type.social_media": "社交媒體",
"feed_view_type.videos": "視頻",
- "mark_all_read_button.auto_confirm_info": "將在 3 秒後自動確認。",
+ "mark_all_read_button.auto_confirm_info": "將在 3 秒後自動確認",
"mark_all_read_button.confirm": "確認",
"mark_all_read_button.confirm_mark_all": "確定將 <which /> 標記為已讀？",
"mark_all_read_button.confirm_mark_all_info": "確定將所有標記為已讀？",
@@ -163,7 +163,7 @@
"notify.unSupportWidth": "{{app_name}} 目前尚未支援流動裝置",
"notify.unSupportWidth_1": "您的裝置寬度為 <b>{{width}}</b>，低於支援的最小寬度 {{minWidth}}",
"notify.unSupportWidth_2": "請切換至桌面應用程式繼續使用 {{app_name}} <br /> 下載連結：<url />",
- "notify.unfollow_feed": "已取消關注 <FeedItem />。",
+ "notify.unfollow_feed": "已取消關注 <FeedItem />",
"notify.update_info": "{{app_name}} 已準備好更新！",
"notify.update_info_1": "點擊以重新啟動",
"player.back_10s": "倒退 10 秒",
@@ -181,7 +181,7 @@
"player.volume": "音量",
"resize.tooltip.double_click_to_collapse": "<b>雙擊</b>以摺疊",
"resize.tooltip.drag_to_resize": "<b>拖曳</b>以調整大小",
- "search.empty.no_results": "未找到結果。",
+ "search.empty.no_results": "未找到結果",
"search.group.entries": "條目",
"search.group.feeds": "訂閱源",
"search.options.all": "所有",
@@ -239,7 +239,7 @@
"tip_modal.feed_owner": "訂閱源擁有者",
"tip_modal.low_balance": "你的餘額不足以覆蓋此贊助。請調整金額。",
"tip_modal.no_wallet": "你尚未擁有錢包。請創建一個錢包以進行贊助。",
- "tip_modal.tip_amount_sent": "已經發送給作者。",
+ "tip_modal.tip_amount_sent": "已經發送給作者",
"tip_modal.tip_now": "立刻贊助",
"tip_modal.tip_sent": "贊助成功！感謝你的支持。",
"tip_modal.tip_support": "⭐ 贊助以顯示你的支持！",
@@ -284,6 +284,7 @@
"words.search": "搜尋",
"words.starred": "收藏",
"words.title": "標題",
+ "words.transform": "轉換",
"words.trending": "熱門",
"words.undo": "撤銷",
"words.unread": "未讀",
diff --git a/locales/common/zh-HK.json b/locales/common/zh-HK.json
index 8f7c2df5a..a948663a4 100644
--- a/locales/common/zh-HK.json
+++ b/locales/common/zh-HK.json
@@ -16,6 +16,7 @@
"words.back": "返回",
"words.copy": "複製",
"words.create": "創建",
+ "words.delete": "刪除",
"words.edit": "編輯",
"words.entry": "條目",
"words.id": "ID",
diff --git a/locales/external/en.json b/locales/external/en.json
index b0a4619fd..09d413db7 100644
--- a/locales/external/en.json
+++ b/locales/external/en.json
@@ -8,7 +8,7 @@
"feed.follower_one": "follower",
"feed.follower_other": "followers",
"feed.followsAndFeeds": "{{subscriptionCount}} {{subscriptionNoun}} and {{feedsCount}} {{feedsNoun}} on {{appName}}",
- "feed.followsAndReads": "{{subscriptionCount}} {{subscriptionNoun}} with {{readCount}} {{readNoun}} on {{appName}}",
+ "feed.followsAndReads": "{{subscriptionCount}} {{subscriptionNoun}} with {{readCount}} recent {{readNoun}} on {{appName}}",
"feed.read_one": "read",
"feed.read_other": "reads",
"feed.view_feed_url": "View Feed URL",
diff --git a/locales/external/zh-CN.json b/locales/external/zh-CN.json
index 567d90f1f..8857c7e35 100644
--- a/locales/external/zh-CN.json
+++ b/locales/external/zh-CN.json
@@ -8,9 +8,9 @@
"feed.follower_one": "关注者",
"feed.follower_other": "关注者",
"feed.followsAndFeeds": "在 {{appName}} 上有 {{subscriptionCount}} 个{{subscriptionNoun}}和 {{feedsCount}} 个{{feedsNoun}}",
- "feed.followsAndReads": "在 {{appName}} 上有 {{subscriptionCount}} 个{{subscriptionNoun}}，{{readCount}} 篇{{readNoun}}",
- "feed.read_one": "文章",
- "feed.read_other": "文章",
+ "feed.followsAndReads": "在 {{appName}} 上有 {{subscriptionCount}} 个{{subscriptionNoun}}，{{readCount}} 次近期{{readNoun}}",
+ "feed.read_one": "阅读",
+ "feed.read_other": "阅读",
"feed.view_feed_url": "查看链接",
"header.app": "应用",
"header.download": "下载",
diff --git a/locales/settings/zh-CN.json b/locales/settings/zh-CN.json
index d53db49b8..aee5edf90 100644
--- a/locales/settings/zh-CN.json
+++ b/locales/settings/zh-CN.json
@@ -89,6 +89,9 @@
"general.app": "应用程序",
"general.data_persist.description": "在本地保留数据以启用离线访问和本地搜索",
"general.data_persist.label": "保留数据以供离线使用",
+ "general.export.button": "导出",
+ "general.export.description": "将你的订阅源导出到 OPML 文件。",
+ "general.export.label": "导出订阅源",
"general.group_by_date.description": "按日期对条目进行分组",
"general.group_by_date.label": "按日期分组",
"general.language": "语言",
diff --git a/locales/settings/zh-HK.json b/locales/settings/zh-HK.json
index 61124c83d..385e08ac9 100644
--- a/locales/settings/zh-HK.json
+++ b/locales/settings/zh-HK.json
@@ -89,6 +89,9 @@
"general.app": "應用程式",
"general.data_persist.description": "本地保存數據以啟用離線存取和本地搜尋。",
"general.data_persist.label": "離線使用時保留數據",
+ "general.export.button": "匯出",
+ "general.export.description": "匯出你的訂閱到 OPML 文件",
+ "general.export.label": "匯出訂閱",
"general.group_by_date.description": "按日期分組條目。",
"general.group_by_date.label": "按日期分組",
"general.language": "語言",
@@ -159,6 +162,8 @@
"lists.create": "建立新清單",
"lists.created.error": "建立清單失敗。",
"lists.created.success": "成功建立清單！",
+ "lists.delete.error": "刪除清單失敗。",
+ "lists.delete.success": "成功刪除清單！",
"lists.description": "描述",
"lists.earnings": "收益",
"lists.edit.error": "編輯清單失敗。",
@@ -184,7 +189,7 @@
"lists.submit": "提交",
"lists.subscriptions": "訂閱",
"lists.title": "標題",
- "lists.view": "查看",
+ "lists.view": "視圖",
"profile.avatar.label": "頭像",
"profile.handle.description": "你的唯一識別符。",
"profile.handle.label": "識別符",
@@ -226,6 +231,7 @@
"wallet.transactions.to": "發送至",
"wallet.transactions.tx": "交易",
"wallet.transactions.type": "類型",
+ "wallet.transactions.types.all": "全部",
"wallet.transactions.types.burn": "銷燬",
"wallet.transactions.types.mint": "鑄造",
"wallet.transactions.types.purchase": "購買",
diff --git a/package.json b/package.json
index e3ed3504c..41d218a66 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Follow",
"type": "module",
- "version": "0.0.1-alpha.19",
+ "version": "0.0.1-alpha.21",
"private": true,
"packageManager": "pnpm@9.11.0",
"description": "Next generation information browser",
diff --git a/packages/shared/src/env.ts b/packages/shared/src/env.ts
index 963343424..ae29ed510 100644
--- a/packages/shared/src/env.ts
+++ b/packages/shared/src/env.ts
@@ -11,27 +11,7 @@ export const env = createEnv({
VITE_SENTRY_DSN: z.string().optional(),
VITE_POSTHOG_KEY: z.string().optional(),
VITE_INBOXES_EMAIL: z.string().default("@follow.re"),
- VITE_FIREBASE_CONFIG: z
- .string()
- .transform((content) => {
- try {
- return JSON.parse(content)
- } catch {
- return z.NEVER
- }
- })
- .pipe(
- z.object({
- apiKey: z.string(),
- authDomain: z.string(),
- projectId: z.string(),
- storageBucket: z.string(),
- messagingSenderId: z.string(),
- appId: z.string(),
- measurementId: z.string(),
- }),
- )
- .optional(),
+ VITE_FIREBASE_CONFIG: z.string().optional(),
},
emptyStringAsUndefined: true,
diff --git a/packages/shared/src/hono.ts b/packages/shared/src/hono.ts
index 9184f21f3..aa6922d00 100644
--- a/packages/shared/src/hono.ts
+++ b/packages/shared/src/hono.ts
@@ -5174,6 +5174,7 @@ declare const _routes: hono_hono_base.HonoBase<Env, {
json: {
entryIds: string[];
isInbox?: boolean | undefined;
+ readHistories?: string[] | undefined;
};
};
output: {
diff --git a/plugins/vite/deps.ts b/plugins/vite/deps.ts
index ebf8ee6fd..1a24a0168 100644
--- a/plugins/vite/deps.ts
+++ b/plugins/vite/deps.ts
@@ -1,6 +1,6 @@
import type { Plugin, UserConfig } from "vite"
-export function createDependencyChunksPlugin(dependencies: string[] | string[][]): Plugin {
+export function createDependencyChunksPlugin(dependencies: string[][]): Plugin {
return {
name: "dependency-chunks",
config(config: UserConfig) {
diff --git a/plugins/vite/specific-import.ts b/plugins/vite/specific-import.ts
new file mode 100644
index 000000000..6717fc261
--- /dev/null
+++ b/plugins/vite/specific-import.ts
@@ -0,0 +1,42 @@
+import type { Plugin } from "vite"
+
+export function createPlatformSpecificImportPlugin(isElectron = false): Plugin {
+ return {
+ name: "platform-specific-import",
+ enforce: "pre",
+ async resolveId(source, importer) {
+ if (!importer) {
+ return null
+ }
+
+ const allowExts = [".js", ".jsx", ".ts", ".tsx"]
+
+ if (!allowExts.some((ext) => importer.endsWith(ext))) return null
+
+ if (importer.includes("node_modules")) return null
+ const [path, query] = source.split("?")
+
+ if (path.startsWith(".") || path.startsWith("/")) {
+ const priorities = isElectron
+ ? [".electron.ts", ".electron.tsx", ".electron.js", ".electron.jsx"]
+ : [".web.ts", ".web.tsx", ".web.js", ".web.jsx"]
+
+ for (const ext of priorities) {
+ const resolvedPath = await this.resolve(
+ `${path}${ext}${query ? `?${query}` : ""}`,
+ importer,
+ {
+ skipSelf: true,
+ },
+ )
+
+ if (resolvedPath) {
+ return resolvedPath.id
+ }
+ }
+ }
+
+ return null
+ },
+ }
+}
diff --git a/types/vite.d.ts b/types/vite.d.ts
index bf3f5370b..43f292ae0 100644
--- a/types/vite.d.ts
+++ b/types/vite.d.ts
@@ -6,6 +6,7 @@ interface ImportMetaEnv {
VITE_IMGPROXY_URL: string
VITE_SENTRY_DSN: string
VITE_POSTHOG_KEY: string
+ VITE_FIREBASE_CONFIG: string
}
interface ImportMeta {
diff --git a/vercel.json b/vercel.json
index 5e537787a..de5710a18 100644
--- a/vercel.json
+++ b/vercel.json
@@ -9,7 +9,7 @@
"destination": "/__debug_proxy.html"
},
{
- "source": "/(.*)",
+ "source": "/((?!assets|vendor|locales/).*)",
"destination": "/index.html"
}
],
@@ -19,7 +19,40 @@
"headers": [
{
"key": "Cache-Control",
- "value": "public, max-age=31536000, immutable"
+ "value": "public, max-age=604800, immutable"
+ },
+ {
+ "key": "CDN-Cache-Control",
+ "value": "max-age=604800"
+ },
+ {
+ "key": "Vercel-CDN-Cache-Control",
+ "value": "max-age=604800"
+ },
+ {
+ "key": "Cloudflare-CDN-Cache-Control",
+ "value": "max-age=604800"
+ }
+ ]
+ },
+ {
+ "source": "/assets/(.*)",
+ "headers": [
+ {
+ "key": "Cache-Control",
+ "value": "public, max-age=604800, immutable"
+ },
+ {
+ "key": "CDN-Cache-Control",
+ "value": "max-age=604800"
+ },
+ {
+ "key": "Vercel-CDN-Cache-Control",
+ "value": "max-age=604800"
+ },
+ {
+ "key": "Cloudflare-CDN-Cache-Control",
+ "value": "max-age=604800"
}
]
}
diff --git a/vite.config.ts b/vite.config.ts
index bce3faf32..f64089379 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,6 +11,7 @@ import { viteRenderBaseConfig } from "./configs/vite.render.config"
import type { env as EnvType } from "./packages/shared/src/env"
import { createDependencyChunksPlugin } from "./plugins/vite/deps"
import { htmlInjectPlugin } from "./plugins/vite/html-inject"
+import { createPlatformSpecificImportPlugin } from "./plugins/vite/specific-import"
const __dirname = fileURLToPath(new URL(".", import.meta.url))
const isCI = process.env.CI === "true" || process.env.CI === "1"
@@ -75,7 +76,8 @@ export default ({ mode }) => {
devPrint(),
createDependencyChunksPlugin([
// React framework
- ["react", "react-dom", "react-router-dom", "react-error-boundary", "react-dom/server"],
+ ["react", "react-dom"],
+ ["react-error-boundary", "react-dom/server", "react-router-dom"],
// Data Statement
["zustand", "jotai", "use-context-selector", "immer", "dexie"],
// Remark
@@ -131,7 +133,6 @@ export default ({ mode }) => {
"@tanstack/react-query-persist-client",
"@tanstack/query-sync-storage-persister",
],
- ["blurhash", "react-blurhash"],
["tldts"],
["shiki", "@shikijs/transformers"],
["@sentry/react", "posthog-js"],
@@ -139,6 +140,8 @@ export default ({ mode }) => {
["swiper"],
]),
+
+ createPlatformSpecificImportPlugin(false),
],
define: {