Merge branch 'dev' into feature/ai

Author: DIYgod

.github/workflows/build-desktop.yml

@@ -32,6 +32,7 @@ env:
   VITE_OPENPANEL_CLIENT_ID: ${{ vars.VITE_OPENPANEL_CLIENT_ID }}
   VITE_OPENPANEL_API_URL: ${{ vars.VITE_OPENPANEL_API_URL }}
   VITE_FIREBASE_CONFIG: ${{ vars.VITE_FIREBASE_CONFIG }}
+  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   NODE_OPTIONS: --max-old-space-size=8192
 
 jobs:
@@ -137,14 +138,11 @@ jobs:
       - name: Build - Vite
         working-directory: apps/desktop
         run: pnpm build:electron-vite ${{ env.PROD == 'false' && '--mode staging' || '' }}
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+
       - name: Build - Windows and Linux
-        if: runner.os != 'macOS'
+        if: runner.os == 'Linux' || (runner.os == 'Windows' && github.event.inputs.store != 'true')
         working-directory: apps/desktop
         run: pnpm build:electron-forge ${{ env.PROD == 'false' && '--mode=staging' || '' }}
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: Build - macOS
         if: runner.os == 'macOS' && github.event.inputs.store != 'true'
@@ -174,12 +172,15 @@ jobs:
         working-directory: apps/desktop
         run: pnpm build:electron-forge:mas
 
+      - name: Build - Microsoft Store
+        if: runner.os == 'Windows' && github.event.inputs.store == 'true'
+        working-directory: apps/desktop
+        run: pnpm build:electron-forge:ms
+
       - name: Build - Renderer
         if: runner.os == 'Linux'
         working-directory: apps/desktop
         run: pnpm build:render
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: Upload file (macos-arm64-dmg)
         uses: actions/upload-artifact@v4

.gitignore

@@ -23,4 +23,6 @@ apps/desktop/src/renderer/dev-dist
 tsconfig.tsbuildinfo
 buildServer.json
 
-**/**/generated-routes.ts
+**/**/generated-routes.ts
+
+apps/desktop/build/appxmanifest.xml

apps/desktop/build/appxmanifest-template.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
+  <Identity Name="{identityName}"
+    ProcessorArchitecture="x64"
+    Publisher="{publisherName}"
+    Version="{packageVersion}" />
+  <Properties>
+    <DisplayName>{packageDisplayName}</DisplayName>
+    <PublisherDisplayName>{publisherDisplayName}</PublisherDisplayName>
+    <Description>No description entered</Description>
+    <Logo>assets\SampleAppx.50x50.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource Language="zh-cn" />
+    <Resource Language="zh-tw" />
+    <Resource Language="ja" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+  </Capabilities>
+  <Applications>
+    <Application Id="{packageName}" Executable="{packageExecutable}" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+       BackgroundColor="{packageBackgroundColor}"
+       DisplayName="{packageDisplayName}"
+       Square150x150Logo="assets\SampleAppx.150x150.png"
+       Square44x44Logo="assets\SampleAppx.44x44.png"
+       Description="{packageDescription}">
+        <uap:DefaultTile Wide310x150Logo="assets\SampleAppx.310x150.png" />
+      </uap:VisualElements>
+      <Extensions>{protocol}
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>

apps/desktop/forge.config.cts

@@ -18,6 +18,8 @@ import { rimraf, rimrafSync } from "rimraf"
 
 const platform = process.argv.find((arg) => arg.startsWith("--platform"))?.split("=")[1]
 const mode = process.argv.find((arg) => arg.startsWith("--mode"))?.split("=")[1]
+const isMicrosoftStore =
+  process.argv.find((arg) => arg.startsWith("--ms"))?.split("=")[1] === "true"
 
 const isStaging = mode === "staging"
 
@@ -185,11 +187,6 @@ const config: ForgeConfig = {
       },
       ["darwin", "mas"],
     ),
-    new MakerSquirrel({
-      name: "Folo",
-      setupIcon: isStaging ? "resources/icon-staging.ico" : "resources/icon.ico",
-      iconUrl: "https://app.folo.is/favicon.ico",
-    }),
     new MakerAppImage({
       config: {
         icons: [
@@ -207,17 +204,29 @@ const config: ForgeConfig = {
       },
       ["mas"],
     ),
-    new MakerAppX({
-      publisher: "CN=7CBBEB6A-9B0E-4387-BAE3-576D0ACA279E",
-      packageDisplayName: "Folo - Follow everything in one place",
-      devCert: "build/dev.pfx",
-      assets: "static/appx",
-      // @ts-ignore
-      publisherDisplayName: "Natural Selection Labs",
-      identityName: "NaturalSelectionLabs.Follow-Yourfavoritesinoneinbo",
-      packageBackgroundColor: "#FF5C00",
-      protocol: "folo",
-    }),
+    // Only include AppX maker for Microsoft Store builds
+    ...(isMicrosoftStore
+      ? [
+          new MakerAppX({
+            publisher: "CN=7CBBEB6A-9B0E-4387-BAE3-576D0ACA279E",
+            packageDisplayName: "Folo - Follow everything in one place",
+            devCert: "build/dev.pfx",
+            assets: "static/appx",
+            manifest: "build/appxmanifest.xml",
+            // @ts-ignore
+            publisherDisplayName: "Natural Selection Labs",
+            identityName: "NaturalSelectionLabs.Follow-Yourfavoritesinoneinbo",
+            packageBackgroundColor: "#FF5C00",
+            protocol: "folo",
+          }),
+        ]
+      : [
+          new MakerSquirrel({
+            name: "Folo",
+            setupIcon: isStaging ? "resources/icon-staging.ico" : "resources/icon.ico",
+            iconUrl: "https://app.folo.is/favicon.ico",
+          }),
+        ]),
   ],
   plugins: [
     // Fuses are used to enable/disable various Electron functionality

apps/desktop/layer/main/src/ipc/services/integration.ts

@@ -3,6 +3,8 @@ import fsp from "node:fs/promises"
 
 import path from "pathe"
 
+import { store } from "~/lib/store"
+
 import type { IpcContext } from "../base"
 import { IpcMethod, IpcService } from "../base"
 
@@ -26,6 +28,22 @@ interface SaveToEagleInput {
   url: string
   mediaUrls: string[]
 }
+
+interface LoginToQBittorrentInput {
+  host: string
+  username: string
+  password: string
+}
+
+interface CheckQBittorrentAuthInput {
+  host: string
+}
+
+interface AddMagnetInput {
+  host: string
+  urls: string[]
+}
+
 export class IntegrationService extends IpcService {
   constructor() {
     super("integration")
@@ -98,4 +116,83 @@ ${content}
       return null
     }
   }
+
+  @IpcMethod()
+  async loginToQBittorrent(context: IpcContext, input: LoginToQBittorrentInput) {
+    const { host, username, password } = input
+
+    const existingSID = store.get("qbittorrentSID")
+    if (existingSID) {
+      const errorMessage = await this.checkQBittorrentAuth(context, { host })
+      if (!errorMessage) {
+        return
+      }
+    }
+
+    const res = await fetch(`${host}/api/v2/auth/login`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}`,
+    })
+
+    if (!res.ok) {
+      return `Failed to log in to qBittorrent: ${await res.text()}`
+    }
+
+    const cookies = res.headers.get("set-cookie") || ""
+    const match = cookies.match(/SID=([^;]+)/)
+    if (!match || !match[1]) {
+      return "Failed to get SID from qBittorrent"
+    }
+
+    store.set("qbittorrentSID", match[1])
+    return
+  }
+
+  async checkQBittorrentAuth(context: IpcContext, input: CheckQBittorrentAuthInput) {
+    const { host } = input
+    const sid = store.get("qbittorrentSID")
+    if (!sid) {
+      return "Not logged in to qBittorrent"
+    }
+    const res = await fetch(`${host}/api/v2/auth/check`, {
+      method: "GET",
+      headers: {
+        Cookie: `SID=${sid}`,
+      },
+      credentials: "omit",
+    })
+
+    if (!res.ok) {
+      return await res.text()
+    }
+  }
+
+  @IpcMethod()
+  async addMagnet(context: IpcContext, input: AddMagnetInput) {
+    const { host, urls } = input
+    const sid = store.get("qbittorrentSID")
+    if (!sid) {
+      return "Not logged in to qBittorrent"
+    }
+    const res = await fetch(`${host}/api/v2/torrents/add`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Cookie: `SID=${sid}`,
+      },
+      credentials: "omit",
+      body: `urls=${encodeURIComponent(urls.join("\n"))}`,
+    })
+
+    if (!res.ok) {
+      const text = await res.text()
+      return `Failed to add magnet links: ${text}`
+    }
+
+    // eslint-disable-next-line no-console
+    console.log(`Added magnet links to qBittorrent: ${urls.join(", ")}`)
+  }
 }

apps/desktop/layer/main/src/lib/store.ts

@@ -9,6 +9,7 @@ type StoreData = {
   cacheSizeLimit?: number | null
   minimizeToTray?: boolean | null
   proxy?: string | null
+  qbittorrentSID?: string | null
   user?: string | null
   windowState?: {
     height: number

apps/desktop/layer/main/src/updater/configs.ts

@@ -1,4 +1,4 @@
-import { DEV, MODE, ModeEnum } from "@follow/shared/constants"
+import { DEV, MICROSOFT_STORE_BUILD, MODE, ModeEnum } from "@follow/shared/constants"
 import path from "pathe"
 
 import { isWindows } from "../env"
@@ -8,7 +8,7 @@ export const appUpdaterConfig = {
   enableRenderHotUpdate: !DEV && MODE !== ModeEnum.staging,
   enableCoreUpdate:
     !process.mas &&
-    !process.windowsStore &&
+    !MICROSOFT_STORE_BUILD &&
     // Disable core update if platfrom is windows and application is't executing from default installion path.
     // If the process is not executed from the default installation path,
     // it is usually managed through a package manager like Scoop.

apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx

@@ -31,6 +31,8 @@ import { useCommandShortcuts } from "~/modules/command/hooks/use-command-binding
 import type { FollowCommandId } from "~/modules/command/types"
 import { useToolbarOrderMap } from "~/modules/customize-toolbar/hooks"
 
+import { useRouteParams } from "./useRouteParams"
+
 export const enableEntryReadability = async ({ id, url }: { id: string; url: string }) => {
   const status = getReadabilityStatus()[id]
   const isTurnOn = status !== ReadabilityStatus.INITIAL && !!status
@@ -126,6 +128,7 @@ const entrySelector = (state: EntryModel) => {
   const { summary, translation, readability } = state.settings || {}
 
   const media = state.media || []
+  const attachments = state.attachments || []
   const images = media.filter((a) => a.type === "photo")
   const imagesLength = images.length
 
@@ -141,6 +144,7 @@ const entrySelector = (state: EntryModel) => {
     hasContent,
     doesContentContainsHTMLTags,
     imagesLength,
+    hasBitTorrent: attachments.some((a) => a.mime_type === "application/x-bittorrent"),
   }
 }
 export const HIDE_ACTIONS_IN_ENTRY_CONTEXT_MENU = [
@@ -165,6 +169,7 @@ export const useEntryActions = ({
   compact?: boolean
 }) => {
   const entry = useEntry(entryId, entrySelector)
+  const { isCollection } = useRouteParams()
   const isInCollection = useIsEntryStarred(entryId)
   const isEntryInReadability = useEntryIsInReadability(entryId)
 
@@ -236,6 +241,12 @@ export const useEntryActions = ({
         onClick: runCmdFn(COMMAND_ID.integration.saveToZotero, [{ entryId }]),
         entryId,
       }),
+      new EntryActionMenuItem({
+        id: COMMAND_ID.integration.saveToQBittorrent,
+        onClick: runCmdFn(COMMAND_ID.integration.saveToQBittorrent, [{ entryId }]),
+        hide: !IN_ELECTRON || !entry.hasBitTorrent,
+        entryId,
+      }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.tip,
         onClick: runCmdFn(COMMAND_ID.entry.tip, [
@@ -326,21 +337,21 @@ export const useEntryActions = ({
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.readAbove,
         onClick: runCmdFn(COMMAND_ID.entry.readAbove, [{ publishedAt: entry.publishedAt }]),
-        hide: !!isInCollection,
+        hide: !!isCollection,
         entryId,
       }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.read,
         onClick: runCmdFn(COMMAND_ID.entry.read, [{ entryId }]),
-        hide: !!isInCollection,
+        hide: !!isCollection,
         active: !!entry.read,
         shortcut: shortcuts[COMMAND_ID.entry.read],
         entryId,
       }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.readBelow,
         onClick: runCmdFn(COMMAND_ID.entry.readBelow, [{ publishedAt: entry.publishedAt }]),
-        hide: !!isInCollection,
+        hide: !!isCollection,
         entryId,
       }),
       MENU_ITEM_SEPARATOR,
@@ -392,20 +403,22 @@ export const useEntryActions = ({
     hasEntry,
     runCmdFn,
     entryId,
-    feed?.id,
-    feed?.ownerUserId,
-    feed?.siteUrl,
-    isInbox,
-    shortcuts,
-    view,
-    isInCollection,
+    entry?.hasBitTorrent,
     entry?.url,
     entry?.imagesLength,
     entry?.publishedAt,
     entry?.read,
     entry?.hasContent,
     entry?.readability,
     entry?.doesContentContainsHTMLTags,
+    feed?.id,
+    feed?.ownerUserId,
+    feed?.siteUrl,
+    isInbox,
+    shortcuts,
+    view,
+    isCollection,
+    isInCollection,
     isShowSourceContent,
     isShowAISummaryAuto,
     isShowAISummaryOnce,