[Browser Bookmarks] Add support for Brave nightly (#9634)

* Changelog * Add brave-nightly.png to browser bookmarks assets * Add support for Brave Nightly bookmarks * Update CHANGELOG.md * Update CHANGELOG.md and optimise images --------- Co-authored-by: Per Nielsen Tikær <[email protected]> Co-authored-by: raycastbot <[email protected]>
raycast · Dec 12, 2023 · cd9cea6 · cd9cea6
1 parent 684b1d3
commit cd9cea6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/extensions/browser-bookmarks/CHANGELOG.md b/extensions/browser-bookmarks/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Browser Bookmarks Changelog
 
-## [Support for Firefox Dev edition] - {PR_MERGE_DATE}
+## [Support for Brave Nightly] - 2023-12-09
+
+- Add support for `Brave Nightly` browser.
+
+## [Support for Firefox Dev edition] - 2023-11-24
 
 - Add support for `Firefox Dev` browser, which uses the same profiles as `Firefox`.
 

diff --git a/extensions/browser-bookmarks/assets/brave-nightly.png b/extensions/browser-bookmarks/assets/brave-nightly.png
diff --git a/extensions/browser-bookmarks/src/hooks/useAvailableBrowsers.ts b/extensions/browser-bookmarks/src/hooks/useAvailableBrowsers.ts
@@ -5,6 +5,7 @@ export const BROWSERS_BUNDLE_ID = {
   arc: "company.thebrowser.browser",
   brave: "com.brave.browser",
   braveBeta: "com.brave.browser.beta",
+  braveNightly: "com.brave.browser.nightly",
   chrome: "com.google.chrome",
   chromeDev: "com.google.chrome.dev",
   firefox: "org.mozilla.firefox",

diff --git a/extensions/browser-bookmarks/src/hooks/useBraveNightlyBookmarks.ts b/extensions/browser-bookmarks/src/hooks/useBraveNightlyBookmarks.ts
@@ -0,0 +1,15 @@
+import { homedir } from "os";
+
+import { BROWSERS_BUNDLE_ID } from "./useAvailableBrowsers";
+import useChromiumBookmarks from "./useChromiumBookmarks";
+
+const BRAVE_NIGHTLY_BOOKMARKS_PATH = `${homedir()}/Library/Application Support/BraveSoftware/Brave-Browser-Nightly`;
+
+export default function useBraveBookmarks(enabled: boolean) {
+  return useChromiumBookmarks(enabled, {
+    path: BRAVE_NIGHTLY_BOOKMARKS_PATH,
+    browserName: "Brave Nightly",
+    browserIcon: "brave-nightly.png",
+    browserBundleId: BROWSERS_BUNDLE_ID.braveNightly,
+  });
+}
diff --git a/extensions/browser-bookmarks/src/index.tsx b/extensions/browser-bookmarks/src/index.tsx
@@ -19,6 +19,7 @@ import useArcBookmarks from "./hooks/useArcBookmarks";
 import useAvailableBrowsers, { BROWSERS_BUNDLE_ID } from "./hooks/useAvailableBrowsers";
 import useBraveBetaBookmarks from "./hooks/useBraveBetaBookmarks";
 import useBraveBookmarks from "./hooks/useBraveBookmarks";
+import useBraveNightlyBookmarks from "./hooks/useBraveNightlyBookmarks";
 import useChromeBookmarks from "./hooks/useChromeBookmarks";
 import useChromeDevBookmarks from "./hooks/useChromeDevBookmarks";
 import useEdgeBookmarks from "./hooks/useEdgeBookmarks";
@@ -99,6 +100,7 @@ export default function Command() {
   const hasArc = browsers.includes(BROWSERS_BUNDLE_ID.arc) ?? false;
   const hasBrave = browsers.includes(BROWSERS_BUNDLE_ID.brave) ?? false;
   const hasBraveBeta = browsers.includes(BROWSERS_BUNDLE_ID.braveBeta) ?? false;
+  const hasBraveNightly = browsers.includes(BROWSERS_BUNDLE_ID.braveNightly) ?? false;
   const hasChrome = browsers.includes(BROWSERS_BUNDLE_ID.chrome) ?? false;
   const hasChromeDev = browsers.includes(BROWSERS_BUNDLE_ID.chromeDev) ?? false;
   const hasEdge = browsers.includes(BROWSERS_BUNDLE_ID.edge) ?? false;
@@ -112,6 +114,7 @@ export default function Command() {
   const arc = useArcBookmarks(hasArc);
   const brave = useBraveBookmarks(hasBrave);
   const braveBeta = useBraveBetaBookmarks(hasBraveBeta);
+  const braveNightly = useBraveNightlyBookmarks(hasBraveNightly);
   const chrome = useChromeBookmarks(hasChrome);
   const chromeDev = useChromeDevBookmarks(hasChromeDev);
   const edge = useEdgeBookmarks(hasEdge);
@@ -129,6 +132,7 @@ export default function Command() {
       ...arc.bookmarks,
       ...brave.bookmarks,
       ...braveBeta.bookmarks,
+      ...braveNightly.bookmarks,
       ...chrome.bookmarks,
       ...chromeDev.bookmarks,
       ...edge.bookmarks,
@@ -174,6 +178,7 @@ export default function Command() {
     arc.bookmarks,
     brave.bookmarks,
     braveBeta.bookmarks,
+    braveNightly.bookmarks,
     chrome.bookmarks,
     chromeDev.bookmarks,
     edge.bookmarks,
@@ -191,6 +196,7 @@ export default function Command() {
       ...arc.folders,
       ...brave.folders,
       ...braveBeta.folders,
+      ...braveNightly.folders,
       ...chrome.folders,
       ...chromeDev.folders,
       ...edge.folders,
@@ -206,6 +212,7 @@ export default function Command() {
     arc.folders,
     brave.folders,
     braveBeta.folders,
+    braveNightly.folders,
     chrome.folders,
     chromeDev.folders,
     edge.folders,
@@ -298,6 +305,9 @@ export default function Command() {
     if (hasBraveBeta) {
       braveBeta.mutate();
     }
+    if (hasBraveNightly) {
+      braveNightly.mutate();
+    }
     if (hasChrome) {
       chrome.mutate();
     }
@@ -366,6 +376,7 @@ export default function Command() {
         arc.isLoading ||
         brave.isLoading ||
         braveBeta.isLoading ||
+        braveNightly.isLoading ||
         chrome.isLoading ||
         chromeDev.isLoading ||
         edge.isLoading ||
@@ -453,6 +464,15 @@ export default function Command() {
                     currentProfile={braveBeta.currentProfile}
                     setCurrentProfile={braveBeta.setCurrentProfile}
                   />
+                  <SelectProfileSubmenu
+                    bundleId={BROWSERS_BUNDLE_ID.braveNightly}
+                    name="Brave Nightly"
+                    icon="brave.png"
+                    shortcut={{ modifiers: ["cmd", "shift"], key: "b" }}
+                    profiles={braveNightly.profiles}
+                    currentProfile={braveNightly.currentProfile}
+                    setCurrentProfile={braveNightly.setCurrentProfile}
+                  />
                   <SelectProfileSubmenu
                     bundleId={BROWSERS_BUNDLE_ID.chrome}
                     name="Chrome"