From 90ee0aff90e184fa170ebdf6740b1454bdf88628 Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Fri, 27 Feb 2026 22:45:15 +1100
Subject: [PATCH] feat: enhance window focus handling and notification system

---
 cinny               |  2 +-
 electron/main.js    | 24 ++++++++++++++++++++----
 electron/preload.js | 10 ++++++++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/cinny b/cinny
index f8af51b..b400c4d 160000
--- a/cinny
+++ b/cinny
@@ -1 +1 @@
-Subproject commit f8af51b75cfa9eeae9cb511126833ad491edf351
+Subproject commit b400c4d6c3b63a4a1fa91ae45e4d08fbf3ab2d34
diff --git a/electron/main.js b/electron/main.js
index a82c13e..19bfe0b 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -608,6 +608,14 @@ ipcMain.handle('window:close', () => {
   if (mainWindow) mainWindow.close();
 });
 
+ipcMain.handle('window:focus', () => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.show();
+    mainWindow.focus();
+  }
+});
+
 ipcMain.handle('window:is-maximized', () => {
   return mainWindow ? mainWindow.isMaximized() : false;
 });
@@ -766,9 +774,8 @@ ipcMain.handle('get-desktop-sources', async (event, opts) => {
 });
 
 // Desktop notification handler
-ipcMain.handle('show-notification', async (event, { title, body, icon }) => {
+ipcMain.handle('show-notification', async (event, { title, body, icon, roomId, eventId }) => {
   try {
-    console.log('Electron notification handler called:', { title, body });
     const { Notification } = require('electron');
     
     if (!Notification.isSupported()) {
@@ -784,15 +791,24 @@ ipcMain.handle('show-notification', async (event, { title, body, icon }) => {
     });
     
     notification.on('click', () => {
-      console.log('Notification clicked');
+      console.log('Paarrot: Notification clicked, roomId:', roomId);
       if (mainWindow) {
+        console.log('Paarrot: Sending navigation to renderer');
         mainWindow.show();
         mainWindow.focus();
+        if (roomId) {
+          mainWindow.webContents.send('notification:navigate', { roomId, eventId });
+          console.log('Paarrot: Navigation event sent');
+        }
+      } else {
+        console.log('Paarrot: No mainWindow available');
       }
     });
     
+    notification.on('show', () => console.log('Paarrot: Notification shown'));
+    notification.on('failed', (e, err) => console.error('Paarrot: Notification failed:', err));
+    
     notification.show();
-    console.log('Notification shown successfully');
     
     return { success: true };
   } catch (error) {
diff --git a/electron/preload.js b/electron/preload.js
index 0fad9fb..b1856f2 100644
--- a/electron/preload.js
+++ b/electron/preload.js
@@ -93,7 +93,8 @@ contextBridge.exposeInMainWorld('electron', {
     unmaximize: () => ipcRenderer.invoke('window:unmaximize'),
     close: () => ipcRenderer.invoke('window:close'),
     isMaximized: () => ipcRenderer.invoke('window:is-maximized'),
-    startDrag: () => ipcRenderer.invoke('window:start-drag')
+    startDrag: () => ipcRenderer.invoke('window:start-drag'),
+    focus: () => ipcRenderer.invoke('window:focus')
   },
   
   // Clipboard
@@ -154,7 +155,12 @@ contextBridge.exposeInMainWorld('electron', {
   
   // Desktop notifications
   notification: {
-    show: (options) => ipcRenderer.invoke('show-notification', options)
+    show: (options) => ipcRenderer.invoke('show-notification', options),
+    onNavigate: (callback) => {
+      const handler = (_, data) => callback(data);
+      ipcRenderer.on('notification:navigate', handler);
+      return () => ipcRenderer.removeListener('notification:navigate', handler);
+    }
   }
 });