Merge pull request #12 from brunofin/develop

brunofin · web-flow · commit 9c3b68217d93 · 2024-04-22T11:01:06.000+02:00
v1.0.5
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@ dist/
 
 # Electron builder output
 build/
+
+browser-extension/chrome/chrome.zip
+browser-extension/firefox/firefox.zip
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ Use the browser extension to open Notion links shared in 3rd party apps such as
 Cohesion supports command-line arguments to customize its behavior:
 
 - `--start-hidden`: Launches Cohesion in a hidden state, accessible from the system tray.
+- `--disable-spellcheck`: Disables spellcheck in the editor. In the future, users will be able to do that through the app settings, and select multiple languages.
 
 ## Development
 
diff --git a/browser-extension/chrome/manifest.json b/browser-extension/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Cohesion Redirector",
   "version": "1.0",
-  "permissions": ["tabs", "activeTab"],
+  "permissions": ["tabs"],
   "background": {
     "service_worker": "background.js"
   },
diff --git a/browser-extension/chrome/screenshot-1.png b/browser-extension/chrome/screenshot-1.png
diff --git a/browser-extension/firefox/background.js b/browser-extension/firefox/background.js
@@ -0,0 +1,6 @@
+chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+  if (changeInfo.url && changeInfo.url.startsWith('https://www.notion.so/')) {
+    chrome.tabs.create({ url: changeInfo.url.replace('https://www.notion.so/', 'notion://www.notion.so/') });
+    chrome.tabs.remove(tabId);
+  }
+});
diff --git a/browser-extension/firefox/icon.png b/browser-extension/firefox/icon.png
diff --git a/browser-extension/firefox/manifest.json b/browser-extension/firefox/manifest.json
@@ -0,0 +1,17 @@
+{
+  "manifest_version": 2,
+  "name": "Cohesion Redirector",
+  "version": "1.0",
+  "description": "Redirects Notion URLs to the Cohesion desktop app.",
+  "permissions": [
+    "tabs",
+    "webNavigation"
+  ],
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
+  "icons": {
+    "48": "icon.png"
+  }
+}
diff --git a/browser-extension/firefox/screenshot-1.png b/browser-extension/firefox/screenshot-1.png
diff --git a/data/io.github.brunofin.Cohesion.appdata.xml b/data/io.github.brunofin.Cohesion.appdata.xml
@@ -36,6 +36,13 @@
   </screenshots>
 
   <releases>
+    <release version="1.0.5" date="2024-04-22">
+      <description>
+        <p>#9 A javascript error occurred in the main process</p>
+        <p>#8 Is there a way to disable spell check?</p>
+        <p>#3 Notifications are not detected when there are more than 9</p>
+      </description>
+    </release>
     <release version="1.0.4" date="2024-04-16">
       <description>
         <p>Add Chrome and Firefox extensions to open Notion links shared in 3rd party apps in Cohesion instead of the browser. Check the GitHub README.md file for extension links.</p>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cohesion",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A Notion Desktop client for Linux",
   "main": "dist/index.js",
   "scripts": {
diff --git a/src/cohesion.ts b/src/cohesion.ts
@@ -25,7 +25,8 @@ export default class Cohesion {
             show: !process.argv.includes("--start-hidden"),
             webPreferences: {
                 preload: path.join(__dirname, 'preload.js'),
-                contextIsolation: false // native Notification override in preload :(
+                contextIsolation: false, // native Notification override in preload :(
+                spellcheck: !process.argv.includes("--disable-spellcheck"),
             }
         });
 
diff --git a/src/index.ts b/src/index.ts
@@ -6,9 +6,8 @@ const protocol = 'notion';
 
 function extractURL(args: string[]): string {
     let url: string = args?.find(arg => arg.startsWith(protocol + '://www.notion.so/'));
-    if (url) url = url.replace(protocol + '://', 'https://');
-
-    return url
+    if (!url) return;
+    return url.replace(protocol + '://', 'https://');
 }
 
 if (process.defaultApp) {
@@ -26,7 +25,8 @@ if (!app.requestSingleInstanceLock()) {
     app.on('second-instance', (event, commandLine) => {
         // Someone tried to run a second instance, we should focus our window.
         if (mainWindow) {
-            mainWindow.loadURL(extractURL(commandLine));
+            const url = extractURL(commandLine);
+            if (url) mainWindow.loadURL(url);
             
             if (mainWindow.isMinimized()) mainWindow.restore()
             mainWindow.focus()
diff --git a/src/module/tray-module.ts b/src/module/tray-module.ts
@@ -23,7 +23,7 @@ export default class TrayModule extends Module {
         this.registerListeners();
     }
 
-    private updateMenu(unread: number = getUnreadMessages(this.window.title)) {
+    private updateMenu(unread = getUnreadMessages(this.window.title)) {
         const menu = Menu.buildFromTemplate([
             {
                 label: this.window.isVisible() ? "Minimize to tray" : "Show Cohesion",
@@ -37,9 +37,9 @@ export default class TrayModule extends Module {
 
         let tooltip = "Cohesion";
 
-        if (unread != 0) {
+        if (unread !== 0) {
             menu.insert(0, new MenuItem({
-                label: unread + " unread notifications",
+                label: (unread === Infinity ? "9+" : unread) + " unread notifications",
                 enabled: false
             }));
 
@@ -77,8 +77,8 @@ export default class TrayModule extends Module {
         this.window.webContents.on("page-title-updated", (_event, title, explicitSet) => {
             if (!explicitSet) return;
 
-            let unread = getUnreadMessages(title);
-
+            const unread = getUnreadMessages(title);
+            
             this.updateMenu(unread);
             this.tray.setImage(unread == 0 ? ICON : ICON_UNREAD);
         });
diff --git a/src/util.ts b/src/util.ts
@@ -12,8 +12,9 @@ export function findIcon(name: string) {
 }
 
 export function getUnreadMessages(title: string) {
-    const matches = title.match(/\(\d+\)/);
-    return matches == null ? 0 : Number.parseInt(matches[0].match(/\d+/)[0]);
+    const matches = title?.match(/\(\d+\)/);
+    if (!matches) return title?.startsWith("(9+)") ? Infinity : 0;
+    return Number.parseInt(matches[0].match(/\d+/)[0]);
 }
 
 function fromDataDirs(iconPath: string) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cohesion",`
`3`		`- "version": "1.0.4",`
	`3`	`+ "version": "1.0.5",`
`4`	`4`	`"description": "A Notion Desktop client for Linux",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"scripts": {`