Merge branch 'dev' into feat/new-user-guide

apps/main/src/tipc/app.ts

@@ -1,3 +1,5 @@
+import fs from "node:fs"
+import fsp from "node:fs/promises"
 import path from "node:path"
 
 import { getRendererHandlers } from "@egoist/tipc/main"
@@ -225,6 +227,46 @@ export const appRoute = {
   }),
 
   clearAllData: t.procedure.action(clearAllData),
+
+  saveToObsidian: t.procedure
+    .input<{
+      url: string
+      title: string
+      content: string
+      author: string
+      publishedAt: string
+      vaultPath: string
+    }>()
+    .action(async ({ input }) => {
+      try {
+        const { url, title, content, author, publishedAt, vaultPath } = input
+
+        const fileName = `${(title || publishedAt).trim().slice(0, 20)}.md`
+        const filePath = path.join(vaultPath, fileName)
+        const exists = fs.existsSync(filePath)
+        if (exists) {
+          return { success: false, error: "File already exists" }
+        }
+
+        const markdown = `---
+url: ${url}
+author: ${author}
+publishedAt: ${publishedAt}
+---
+
+# ${title}
+
+${content}
+`
+
+        await fsp.writeFile(filePath, markdown, "utf-8")
+        return { success: true }
+      } catch (error) {
+        console.error("Failed to save to Obsidian:", error)
+        const errorMessage = error instanceof Error ? error.message : String(error)
+        return { success: false, error: errorMessage }
+      }
+    }),
 }
 
 interface Sender extends Electron.WebContents {

apps/renderer/src/atoms/settings/integration.ts

@@ -19,6 +19,10 @@ export const createDefaultSettings = (): IntegrationSettings => ({
   enableOmnivore: false,
   omnivoreEndpoint: "",
   omnivoreToken: "",
+
+  // obsidian
+  enableObsidian: false,
+  obsidianVaultPath: "",
 })
 
 export const {

apps/renderer/src/components/ui/platform-icon/collections/obsidian.tsx

@@ -0,0 +1,18 @@
+import type { SVGProps } from "react"
+
+export function SimpleIconsObsidian(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="1em"
+      height="1em"
+      viewBox="0 0 512 512"
+      {...props}
+    >
+      <path
+        fill="currentColor"
+        d="M359.9 434.3c-2.6 19.1-21.3 34-40 28.9-26.4-7.3-57-18.7-84.7-20.8l-42.3-3.2a27.9 27.9 0 0 1-18-8.4l-73-75a27.9 27.9 0 0 1-5.4-31s45.1-99 46.8-104.2c1.7-5.1 7.8-50 11.4-74.2a28 28 0 0 1 9-16.6l86.2-77.5a28 28 0 0 1 40.6 3.5l72.5 92a29.7 29.7 0 0 1 6.2 18.3c0 17.4 1.5 53.2 11.1 76.3a303 303 0 0 0 35.6 58.5 14 14 0 0 1 1.1 15.7c-6.4 10.8-18.9 31.4-36.7 57.9a143.3 143.3 0 0 0-20.4 59.8Z"
+      />
+    </svg>
+  )
+}

apps/renderer/src/components/ui/platform-icon/icons.ts

@@ -1,5 +1,6 @@
 export * from "./collections/eagle"
 export * from "./collections/instapaper"
+export * from "./collections/obsidian"
 export * from "./collections/omnivore"
 export * from "./collections/readwise"
 export * from "./collections/rss3"

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

@@ -25,6 +25,7 @@ import { mountLottie } from "~/components/ui/lottie-container"
 import {
   SimpleIconsEagle,
   SimpleIconsInstapaper,
+  SimpleIconsObsidian,
   SimpleIconsOmnivore,
   SimpleIconsReadwise,
 } from "~/components/ui/platform-icon/icons"
@@ -171,6 +172,34 @@ export const useEntryActions = ({
   const enableOmnivore = useIntegrationSettingKey("enableOmnivore")
   const omnivoreToken = useIntegrationSettingKey("omnivoreToken")
   const omnivoreEndpoint = useIntegrationSettingKey("omnivoreEndpoint")
+  const enableObsidian = useIntegrationSettingKey("enableObsidian")
+  const obsidianVaultPath = useIntegrationSettingKey("obsidianVaultPath")
+  const isObsidianEnabled = enableObsidian && !!obsidianVaultPath
+
+  const saveToObsidian = useMutation({
+    mutationKey: ["save-to-obsidian"],
+    mutationFn: async (data: {
+      url: string
+      title: string
+      content: string
+      author: string
+      publishedAt: string
+      vaultPath: string
+    }) => {
+      return await tipcClient?.saveToObsidian(data)
+    },
+    onSuccess: (data) => {
+      if (data?.success) {
+        toast.success(t("entry_actions.saved_to_obsidian"), {
+          duration: 3000,
+        })
+      } else {
+        toast.error(`${t("entry_actions.failed_to_save_to_obsidian")}: ${data?.error}`, {
+          duration: 3000,
+        })
+      }
+    },
+  })
 
   const checkEagle = useQuery({
     queryKey: ["check-eagle"],
@@ -370,6 +399,24 @@ export const useEntryActions = ({
           }
         },
       },
+      {
+        name: t("entry_actions.save_to_obsidian"),
+        icon: <SimpleIconsObsidian />,
+        key: "saveToObsidian",
+        hide: !isObsidianEnabled || !populatedEntry?.entries?.url,
+        onClick: () => {
+          if (!isObsidianEnabled || !populatedEntry?.entries?.url) return
+
+          saveToObsidian.mutate({
+            url: populatedEntry.entries.url,
+            title: populatedEntry.entries.title || "",
+            content: populatedEntry.entries.content || "",
+            author: populatedEntry.entries.author || "",
+            publishedAt: populatedEntry.entries.publishedAt || "",
+            vaultPath: obsidianVaultPath,
+          })
+        },
+      },
       {
         key: "tip",
         shortcut: shortcuts.entry.tip.key,
@@ -534,9 +581,16 @@ export const useEntryActions = ({
     enableInstapaper,
     instapaperPassword,
     instapaperUsername,
+    enableOmnivore,
+    omnivoreToken,
+    omnivoreEndpoint,
+    isObsidianEnabled,
+    isInbox,
     feed?.ownerUserId,
     type,
     showSourceContent,
+    obsidianVaultPath,
+    saveToObsidian,
     openTipModal,
     collect,
     uncollect,

apps/renderer/src/modules/settings/tabs/integration.tsx

@@ -7,6 +7,7 @@ import { Divider } from "~/components/ui/divider"
 import {
   SimpleIconsEagle,
   SimpleIconsInstapaper,
+  SimpleIconsObsidian,
   SimpleIconsOmnivore,
   SimpleIconsReadwise,
 } from "~/components/ui/platform-icon/icons"
@@ -151,6 +152,24 @@ export const SettingIntegration = () => {
               </>
             ),
           }),
+          {
+            type: "title",
+            value: (
+              <span className="flex items-center gap-2 font-bold">
+                <SimpleIconsObsidian />
+                {t("integration.obsidian.title")}
+              </span>
+            ),
+          },
+          defineSettingItem("enableObsidian", {
+            label: t("integration.obsidian.enable.label"),
+            description: t("integration.obsidian.enable.description"),
+          }),
+          defineSettingItem("obsidianVaultPath", {
+            label: t("integration.obsidian.vaultPath.label"),
+            vertical: true,
+            description: t("integration.obsidian.vaultPath.description"),
+          }),
 
           BottomTip,
         ]}

locales/app/ar-DZ.json

@@ -17,15 +17,18 @@
   "entry_actions.copy_link": "نسخ الرابط",
   "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.",
   "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.",
+  "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian.",
   "entry_actions.failed_to_save_to_readwise": "فشل في الحفظ إلى Readwise.",
   "entry_actions.mark_as_read": "تحديد كمقروء",
   "entry_actions.mark_as_unread": "تحديد كغير مقروء",
   "entry_actions.open_in_browser": "فتح في المتصفح",
   "entry_actions.save_media_to_eagle": "حفظ الوسائط إلى Eagle",
   "entry_actions.save_to_instapaper": "حفظ إلى Instapaper",
+  "entry_actions.save_to_obsidian": "حفظ إلى Obsidian",
   "entry_actions.save_to_readwise": "حفظ إلى Readwise",
   "entry_actions.saved_to_eagle": "تم الحفظ إلى Eagle.",
   "entry_actions.saved_to_instapaper": "تم الحفظ إلى Instapaper.",
+  "entry_actions.saved_to_obsidian": "تم الحفظ إلى Obsidian.",
   "entry_actions.saved_to_readwise": "تم الحفظ إلى Readwise.",
   "entry_actions.share": "مشاركة",
   "entry_actions.star": "تمييز بنجمة",

locales/app/ar-IQ.json

@@ -17,15 +17,18 @@
   "entry_actions.copy_link": "نسخ الرابط",
   "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.",
   "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.",
+  "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian.",
   "entry_actions.failed_to_save_to_readwise": "فشل في الحفظ إلى Readwise.",
   "entry_actions.mark_as_read": "تحديد كمقروء",
   "entry_actions.mark_as_unread": "تحديد كغير مقروء",
   "entry_actions.open_in_browser": "فتح في المتصفح",
   "entry_actions.save_media_to_eagle": "حفظ الوسائط إلى Eagle",
   "entry_actions.save_to_instapaper": "حفظ إلى Instapaper",
+  "entry_actions.save_to_obsidian": "حفظ إلى Obsidian",
   "entry_actions.save_to_readwise": "حفظ إلى Readwise",
   "entry_actions.saved_to_eagle": "تم الحفظ إلى Eagle.",
   "entry_actions.saved_to_instapaper": "تم الحفظ إلى Instapaper.",
+  "entry_actions.saved_to_obsidian": "تم الحفظ إلى Obsidian.",
   "entry_actions.saved_to_readwise": "تم الحفظ إلى Readwise.",
   "entry_actions.share": "مشاركة",
   "entry_actions.star": "إضافة إلى المفضلة",

locales/app/ar-KW.json

@@ -17,15 +17,18 @@
   "entry_actions.copy_link": "نسخ الرابط",
   "entry_actions.failed_to_save_to_eagle": "فشل في الحفظ إلى Eagle.",
   "entry_actions.failed_to_save_to_instapaper": "فشل في الحفظ إلى Instapaper.",
+  "entry_actions.failed_to_save_to_obsidian": "فشل في الحفظ إلى Obsidian",
   "entry_actions.failed_to_save_to_readwise": "فشل في الحفظ إلى Readwise.",
   "entry_actions.mark_as_read": "وضع علامة كمقروء",
   "entry_actions.mark_as_unread": "وضع علامة كغير مقروء",
   "entry_actions.open_in_browser": "فتح في المتصفح",
   "entry_actions.save_media_to_eagle": "حفظ الوسائط إلى Eagle",
   "entry_actions.save_to_instapaper": "حفظ إلى Instapaper",
+  "entry_actions.save_to_obsidian": "حفظ إلى Obsidian",
   "entry_actions.save_to_readwise": "حفظ إلى Readwise",
   "entry_actions.saved_to_eagle": "تم الحفظ إلى Eagle.",
   "entry_actions.saved_to_instapaper": "تم الحفظ إلى Instapaper.",
+  "entry_actions.saved_to_obsidian": "تم الحفظ إلى Obsidian.",
   "entry_actions.saved_to_readwise": "تم الحفظ إلى Readwise.",
   "entry_actions.share": "مشاركة",
   "entry_actions.star": "تفضيل",

locales/app/ar-MA.json

@@ -17,16 +17,19 @@
   "entry_actions.copy_link": "نسخ الرابط",
   "entry_actions.failed_to_save_to_eagle": "فشل الحفظ إلى Eagle.",
   "entry_actions.failed_to_save_to_instapaper": "فشل الحفظ إلى Instapaper.",
+  "entry_actions.failed_to_save_to_obsidian": "فشل الحفظ في Obsidian",
   "entry_actions.failed_to_save_to_readwise": "فشل الحفظ إلى Readwise.",
   "entry_actions.mark_as_read": "وضع علامة كمقروء",
   "entry_actions.mark_as_unread": "وضع علامة كغير مقروء",
   "entry_actions.open_in_browser": "فتح في المتصفح",
   "entry_actions.save_media_to_eagle": "حفظ الوسائط إلى Eagle",
   "entry_actions.save_to_instapaper": "حفظ إلى Instapaper",
+  "entry_actions.save_to_obsidian": "حفظ في Obsidian",
   "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_obsidian": "تم الحفظ في Obsidian",
+  "entry_actions.saved_to_readwise": "تم الحفظ في Readwise.",
   "entry_actions.share": "مشاركة",
   "entry_actions.star": "إضافة إلى المفضلة",
   "entry_actions.starred": "مضاف إلى المفضلة.",

locales/app/de.json

@@ -17,15 +17,18 @@
   "entry_actions.copy_link": "Link kopieren",
   "entry_actions.failed_to_save_to_eagle": "Speichern in Eagle fehlgeschlagen.",
   "entry_actions.failed_to_save_to_instapaper": "Speichern in Instapaper fehlgeschlagen.",
+  "entry_actions.failed_to_save_to_obsidian": "Speichern in Obsidian fehlgeschlagen",
   "entry_actions.failed_to_save_to_readwise": "Speichern in Readwise fehlgeschlagen.",
   "entry_actions.mark_as_read": "Als gelesen markieren",
   "entry_actions.mark_as_unread": "Als ungelesen markieren",
   "entry_actions.open_in_browser": "Im Browser öffnen",
   "entry_actions.save_media_to_eagle": "Medien in Eagle speichern",
   "entry_actions.save_to_instapaper": "In Instapaper speichern",
+  "entry_actions.save_to_obsidian": "In Obsidian speichern",
   "entry_actions.save_to_readwise": "In Readwise speichern",
   "entry_actions.saved_to_eagle": "In Eagle gespeichert.",
   "entry_actions.saved_to_instapaper": "In Instapaper gespeichert.",
+  "entry_actions.saved_to_obsidian": "In Obsidian gespeichert",
   "entry_actions.saved_to_readwise": "In Readwise gespeichert.",
   "entry_actions.share": "Teilen",
   "entry_actions.star": "Favorisieren",

locales/app/en.json

@@ -59,6 +59,7 @@
   "entry_actions.copy_title": "Copy Title",
   "entry_actions.failed_to_save_to_eagle": "Failed to save to Eagle.",
   "entry_actions.failed_to_save_to_instapaper": "Failed to save to Instapaper.",
+  "entry_actions.failed_to_save_to_obsidian": "Failed to save to Obsidian",
   "entry_actions.failed_to_save_to_omnivore": "Failed to save to Omnivore.",
   "entry_actions.failed_to_save_to_readwise": "Failed to save to Readwise.",
   "entry_actions.mark_as_read": "Mark as Read",
@@ -67,10 +68,12 @@
   "entry_actions.recent_reader": "Recent reader:",
   "entry_actions.save_media_to_eagle": "Save Media To Eagle",
   "entry_actions.save_to_instapaper": "Save To Instapaper",
+  "entry_actions.save_to_obsidian": "Save to Obsidian",
   "entry_actions.save_to_omnivore": "Save To Omnivore",
   "entry_actions.save_to_readwise": "Save To Readwise",
   "entry_actions.saved_to_eagle": "Saved To Eagle.",
   "entry_actions.saved_to_instapaper": "Saved To Instapaper.",
+  "entry_actions.saved_to_obsidian": "Saved to Obsidian",
   "entry_actions.saved_to_omnivore": "Saved To Omnivore.",
   "entry_actions.saved_to_readwise": "Saved To Readwise.",
   "entry_actions.share": "Share",

locales/app/es.json

@@ -15,12 +15,15 @@
   "discover.rss_url": "RSS URL",
   "discover.select_placeholder": "Seleccionar",
   "entry_actions.copy_link": "Copiar enlace",
+  "entry_actions.failed_to_save_to_obsidian": "Error al guardar en Obsidian",
   "entry_actions.mark_as_read": "Marcar como leído",
   "entry_actions.mark_as_unread": "Marcar como no leído",
   "entry_actions.open_in_browser": "Abrir en el navegador",
   "entry_actions.save_media_to_eagle": "Guardar medios en Eagle",
   "entry_actions.save_to_instapaper": "Guardar en Instapaper",
+  "entry_actions.save_to_obsidian": "Guardar en Obsidian",
   "entry_actions.save_to_readwise": "Guardar en Readwise",
+  "entry_actions.saved_to_obsidian": "Guardado en Obsidian",
   "entry_actions.share": "Compartir",
   "entry_actions.star": "Agregar a favoritos",
   "entry_actions.tip": "Dar propina",

locales/app/zh-CN.json

@@ -55,6 +55,7 @@
   "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_obsidian": "保存到 Obsidian 失败",
   "entry_actions.failed_to_save_to_omnivore": "保存到 Omnivore 失败",
   "entry_actions.failed_to_save_to_readwise": "保存到 Readwise 失败",
   "entry_actions.mark_as_read": "标记为已读",
@@ -63,10 +64,12 @@
   "entry_actions.recent_reader": "最近阅读者：",
   "entry_actions.save_media_to_eagle": "保存到 Eagle",
   "entry_actions.save_to_instapaper": "保存到 Instapaper",
+  "entry_actions.save_to_obsidian": "保存到 Obsidian",
   "entry_actions.save_to_omnivore": "保存到 Omnivore",
   "entry_actions.save_to_readwise": "保存到 Readwise",
   "entry_actions.saved_to_eagle": "保存到 Eagle",
   "entry_actions.saved_to_instapaper": "保存到 Instapaper.",
+  "entry_actions.saved_to_obsidian": "已保存到 Obsidian",
   "entry_actions.saved_to_omnivore": "保存到 Omnivore.",
   "entry_actions.saved_to_readwise": "保存到 Readwise.",
   "entry_actions.share": "分享",

locales/app/zh-HK.json

@@ -55,6 +55,7 @@
   "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_obsidian": "儲存至 Obsidian 失敗",
   "entry_actions.failed_to_save_to_omnivore": "無法保存至 Omnivore",
   "entry_actions.failed_to_save_to_readwise": "無法保存至 Readwise",
   "entry_actions.mark_as_read": "標記為已讀",
@@ -63,12 +64,14 @@
   "entry_actions.recent_reader": "最近閱讀者：",
   "entry_actions.save_media_to_eagle": "保存媒體至 Eagle",
   "entry_actions.save_to_instapaper": "保存至 Instapaper",
+  "entry_actions.save_to_obsidian": "儲存至 Obsidian",
   "entry_actions.save_to_omnivore": "保存至 Omnivore",
-  "entry_actions.save_to_readwise": "保存至 Readwise",
+  "entry_actions.save_to_readwise": "儲存至 Readwise",
   "entry_actions.saved_to_eagle": "已保存至 Eagle",
   "entry_actions.saved_to_instapaper": "已保存至 Instapaper",
+  "entry_actions.saved_to_obsidian": "已儲存至 Obsidian",
   "entry_actions.saved_to_omnivore": "已保存至 Omnivore",
-  "entry_actions.saved_to_readwise": "已保存至 Readwise",
+  "entry_actions.saved_to_readwise": "已儲存至 Readwise",
   "entry_actions.share": "分享",
   "entry_actions.star": "收藏",
   "entry_actions.starred": "已收藏",
@@ -197,7 +200,7 @@
   "sidebar.add_more_feeds": "添加訂閱源",
   "sidebar.category_remove_dialog.cancel": "取消",
   "sidebar.category_remove_dialog.continue": "繼續",
-  "sidebar.category_remove_dialog.description": "此操作將刪除你的分類，但其中的訂閱源將保留並按網站分組。",
+  "sidebar.category_remove_dialog.description": "此操作將刪除你的分類，但其中的訂閱源將留並按網站分組。",
   "sidebar.category_remove_dialog.title": "刪除分類",
   "sidebar.feed_actions.claim": "認領",
   "sidebar.feed_actions.claim_feed": "認領訂閱源",