feat: replace all follow dialog with native new window

RSSNext · May 31, 2024 · 4be62e6 · 4be62e6
1 parent 2491d00
commit 4be62e6
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 342 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -64,6 +64,12 @@ app.whenReady().then(() => {
         })
         mainWindow.reload()
       }
+    } else {
+      createWindow({
+        extraPath: url.replace("follow:/", ""),
+        width: 800,
+        height: 600,
+      })
     }
   }
 
@@ -137,7 +143,7 @@ Menu.setApplicationMenu(
           label: "follow https://rsshub.app/twitter/user/DIYgod",
           click: () => {
             createWindow({
-              extraPath: `/follow?url=${encodeURIComponent("https://rsshub.app/twitter/user/DIYgod")}`,
+              extraPath: `/add?url=${encodeURIComponent("https://rsshub.app/twitter/user/DIYgod")}`,
               width: 800,
               height: 600,
             })
@@ -147,7 +153,7 @@ Menu.setApplicationMenu(
           label: "follow https://diygod.me/feed",
           click: () => {
             createWindow({
-              extraPath: `/follow?url=${encodeURIComponent("https://diygod.me/feed")}`,
+              extraPath: `/add?url=${encodeURIComponent("https://diygod.me/feed")}`,
               width: 800,
               height: 600,
             })

diff --git a/src/renderer/src/components/discover/button.tsx b/src/renderer/src/components/discover/button.tsx
diff --git a/src/renderer/src/components/discover/dialog.tsx b/src/renderer/src/components/discover/dialog.tsx
diff --git a/src/renderer/src/components/discover/form.tsx b/src/renderer/src/components/discover/form.tsx
@@ -24,7 +24,6 @@ import { useForm } from "react-hook-form"
 import { z } from "zod"
 
 import { FollowSummary } from "../feed-summary"
-import { DiscoverButton } from "./button"
 
 const formSchema = z.object({
   keyword: z.string().min(1),
@@ -186,7 +185,7 @@ export function DiscoverForm({ type }: { type: string }) {
                                 </Button>
                               ) :
                               (
-                                <DiscoverButton feed={item.feed} />
+                                <Button onClick={() => window.open(`follow://add${item.feed.id ? `?id=${item.feed.id}` : `?url=${item.feed.url}`}`)}>Follow</Button>
                               )}
                           <div className="ml-6 text-zinc-500">
                             <span className="font-medium text-zinc-800">