Merge remote-tracking branch 'origin/main' into dev

apps/main/src/helper.ts

@@ -1,10 +1,13 @@
 import path from "node:path"
 import { fileURLToPath } from "node:url"
 
+import { isMacOS } from "./env"
+
 const __dirname = fileURLToPath(new URL(".", import.meta.url))
 const iconMap = {
   prod: path.join(__dirname, "../../resources/icon.png"),
   dev: path.join(__dirname, "../../static/icon-dev.png"),
 }
 export const getIconPath = () => iconMap[process.env.NODE_ENV === "development" ? "dev" : "prod"]
-export const getTrayIconPath = () => path.join(__dirname, "../../resources/tray-icon.png")
+export const getTrayIconPath = () =>
+  isMacOS ? path.join(__dirname, "../../resources/tray-icon.png") : getIconPath()

apps/main/src/index.ts

@@ -44,7 +44,7 @@ function bootstrap() {
   app.on("second-instance", (_, commandLine) => {
     if (mainWindow) {
       if (mainWindow.isMinimized()) mainWindow.restore()
-      mainWindow.focus()
+      mainWindow.show()
     }
 
     const url = commandLine.pop()

apps/main/src/lib/tray.ts

@@ -38,7 +38,6 @@ export const registerAppTray = () => {
 
 const showWindow = () => {
   const mainWindow = getMainWindowOrCreate()
-  if (!mainWindow) return
   if (mainWindow.isMinimized()) {
     mainWindow.restore()
   } else {

apps/renderer/src/hooks/biz/useSignOut.ts

@@ -4,7 +4,7 @@ import { signOut } from "@hono/auth-js/react"
 import { useCallback } from "react"
 
 import { setWhoami } from "~/atoms/user"
-import { QUERY_PERSIST_KEY } from "~/constants"
+import { isWebBuild, QUERY_PERSIST_KEY } from "~/constants"
 import { tipcClient } from "~/lib/client"
 import { clearLocalPersistStoreData } from "~/store/utils/clear"
 
@@ -23,6 +23,6 @@ export const useSignOut = () =>
     await Promise.allSettled([clearLocalPersistStoreData(), tipcClient?.cleanAuthSessionToken()])
     // Sign out
     await signOut({
-      callbackUrl: env.VITE_WEB_URL,
+      callbackUrl: isWebBuild ? env.VITE_WEB_URL : undefined,
     })
   }, [])

apps/renderer/src/modules/feed-column/list.tsx

@@ -207,10 +207,7 @@ function FeedListImpl({ className, view }: { className?: string; view: number })
         }}
         mask={false}
         flex
-        viewportClassName={cn(
-          "!px-3 [&>[data-radix-scroll-area-content]]:h-full",
-          isDragging && "!overflow-visible",
-        )}
+        viewportClassName={cn("!px-3", isDragging && "!overflow-visible")}
         rootClassName={cn("h-full", isDragging && "overflow-visible")}
       >
         <div
@@ -251,7 +248,7 @@ function FeedListImpl({ className, view }: { className?: string; view: number })
         )}
 
         <DraggableContext.Provider value={draggableContextValue}>
-          <div className="h-full space-y-px" id="feeds-area" ref={setNodeRef}>
+          <div className="space-y-px" id="feeds-area" ref={setNodeRef}>
             {(hasListData || hasInboxData) && (
               <div
                 className={cn(

apps/renderer/src/pages/(main)/layout.tsx

@@ -30,7 +30,7 @@ import { ErrorComponentType } from "~/components/errors/enum"
 import { Kbd } from "~/components/ui/kbd/Kbd"
 import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
 import { DeclarativeModal } from "~/components/ui/modal/stacked/declarative-modal"
-import { HotKeyScopeMap, isDev } from "~/constants"
+import { HotKeyScopeMap, isDev, isWebBuild } from "~/constants"
 import { shortcuts } from "~/constants/shortcuts"
 import { useDailyTask } from "~/hooks/biz/useDailyTask"
 import { useAuthQuery, useI18n } from "~/hooks/common"
@@ -63,7 +63,7 @@ const FooterInfo = () => {
         </div>
       )}
 
-      {!ELECTRON && (
+      {isWebBuild && (
         <div className="center absolute inset-y-0 right-2">
           <button
             type="button"

apps/renderer/src/queries/auth.ts

@@ -24,6 +24,8 @@ export const useSession = (options?: { enabled?: boolean }) => {
       return !!(3 - failureCount)
     },
     enabled: options?.enabled ?? true,
+    refetchOnMount: true,
+    staleTime: 0,
     meta: {
       persist: true,
     },

bump.hotfix.config.js

@@ -8,7 +8,7 @@ const currentBranch = execSync("git rev-parse --abbrev-ref HEAD").toString().tri
 export default defineConfig({
   before: ["git pull --rebase"],
   after: [
-    `gh pr create --title 'chore: Hotfix to release v\${NEW_VERSION}' --body 'v\${NEW_VERSION}' --base main --head ${currentBranch}`,
+    `gh pr create --title 'chore: Release v\${NEW_VERSION} for hotfix' --body 'v\${NEW_VERSION}' --base main --head ${currentBranch}`,
   ],
   commit_message: "chore(release): hotfix to release v${NEW_VERSION}",
   tag: false,

changelog/0.2.0-beta.1.md

@@ -0,0 +1,22 @@
+# What's new in v0.2.0
+
+## New Features
+
+- Feed owners can now reset their feeds.
+- Image Gallery: Clicking on the image button in the entry opens the Image gallery modal (only if there are multiple large images in the entry!).
+- Now you can export the data from the local database.
+- App: In consideration of your hard drive, now it supports clearing cache and limiting the size of cache.
+- Added a new feature to allow minimizing to the system tray by enabling a switch in the settings.
+- Discover Page: Enhance RSSHub recommendations with filters
+- Quickly update views or categories at once by dragging and dropping.
+
+## Improvements
+
+- Optimized the Zen mode experience on macOS.
+- Improvement web app global shortcuts.
+- Optimized the Timeline's data cache, reducing data reloads within a short period of time. You can go to Settings -> General -> Timeline -> Reduce timeline refetch to control this feature, default is enabled.
+
+## Bug Fixes
+
+- Fixed the issue where the Volume of VideoPlayer was not clickable.
+- While using arrow keys to switch between entries, the entry view will not scroll unexpexted.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Follow",
   "type": "module",
-  "version": "0.2.0-beta.0",
+  "version": "0.2.0-beta.1",
   "private": true,
   "packageManager": "[email protected]",
   "description": "Next generation information browser",