fix: address PR review findings — listener leak, type contracts, dead ref, stale guard, cfg scope, shortcut loop, timer constant

Author: VariableThe

src-tauri/Cargo.toml

@@ -33,5 +33,11 @@ tauri-plugin-notification = "2.0.0-rc.5"
 cocoa = "0.25"
 objc = "0.2"
 
+# The objc v0.2 crate macros use cfg(cargo-clippy) which is no longer recognized,
+# producing unexpected_cfgs warnings from external macro expansions that cannot
+# be suppressed per-function or per-module (the span originates in objc crate code).
 [lints.rust]
 unexpected_cfgs = "allow"
+
+
+

src-tauri/src/macos.rs

@@ -1,5 +1,3 @@
-#![allow(unexpected_cfgs)]
-
 #[cfg(target_os = "macos")]
 use tauri::{AppHandle, Emitter};
 

src/App.tsx

@@ -24,7 +24,6 @@ import { Editor, type EditorRef } from './components/Editor'
 import Settings from './Settings'
 
 const TOAST_TIMEOUT_MS = 5000
-const FOCUS_DELAY_MS = 50
 const MODAL_Z_INDEX = 9999
 const KEYBINDS_Z_INDEX = 10000
 const TOAST_Z_INDEX = 99999
@@ -42,7 +41,6 @@ function App() {
   const setShowTimersView = useAppStore((state) => state.setShowTimersView)
   const toasts = useAppStore((state) => state.toasts)
   const removeToast = useAppStore((state) => state.removeToast)
-  const showNoteSearch = useAppStore((state) => state.showNoteSearch)
   const setShowMainActionMenu = useAppStore((state) => state.setShowMainActionMenu)
   const showSettingsModal = useAppStore((state) => state.showSettingsModal)
   const setShowSettingsModal = useAppStore((state) => state.setShowSettingsModal)
@@ -54,8 +52,6 @@ function App() {
 
   const editorRef = useRef<EditorRef>(null)
 
-  const searchInputRef = useRef<HTMLInputElement>(null)
-
   useNoteStorage()
   useVariables()
   useReminders()
@@ -120,14 +116,6 @@ function App() {
     }
   }, [toasts, removeToast])
 
-  useEffect(() => {
-    if (showNoteSearch && searchInputRef.current) {
-      setTimeout(() => {
-        searchInputRef.current?.focus()
-      }, FOCUS_DELAY_MS)
-    }
-  }, [showNoteSearch])
-
   useEffect(() => {
     async function checkVersion() {
       if (notes.length === 0) return

src/api.ts

@@ -4,11 +4,17 @@ import type { ElectronAPI, ReminderPayload } from './types'
 
 const onEvent = (name: string, callback: () => void) => {
   let unlisten: (() => void) | undefined
+  let disposed = false
   listen(name, () => callback()).then((fn) => {
+    if (disposed) {
+      fn()
+      return
+    }
     unlisten = fn
   })
   return () => {
-    if (unlisten) unlisten()
+    disposed = true
+    unlisten?.()
   }
 }
 
@@ -55,7 +61,7 @@ export const tauriApi: ElectronAPI = {
   safeStorageDecrypt: (val) => invoke('safe_storage_decrypt', { val }),
   onPowerSuspend: (callback) => onEvent('power:suspend', callback),
   onPowerResume: (callback) => onEvent('power:resume', callback),
-  pauseShortcuts: () => invoke('pause_shortcuts') as unknown as void,
-  resumeShortcuts: () => invoke('resume_shortcuts') as unknown as void,
+  pauseShortcuts: () => invoke('pause_shortcuts'),
+  resumeShortcuts: () => invoke('resume_shortcuts'),
   onUpdateReady: (callback) => onEvent('update-ready', callback),
 }

src/components/KeybindsModal.tsx

@@ -13,6 +13,8 @@ interface ShortcutConfig {
   storageKey: string
   defaultKey: string
   section: 'global' | 'app'
+  action?: string
+  oldShortcutStorageKey?: string
 }
 
 export function KeybindsModal({ onClose }: KeybindsModalProps) {
@@ -26,13 +28,17 @@ export function KeybindsModal({ onClose }: KeybindsModalProps) {
       storageKey: SETTINGS_KEYS.SHORTCUT_TOGGLE,
       defaultKey: `${defaultMod}+Shift+C`,
       section: 'global',
+      action: 'toggle',
+      oldShortcutStorageKey: 'papercache-shortcut-toggle',
     },
     {
       key: 'shortcutNewNote',
       label: 'New Note (Global)',
       storageKey: SETTINGS_KEYS.SHORTCUT_NEWNOTE,
       defaultKey: `${defaultMod}+Shift+N`,
       section: 'global',
+      action: 'new-note',
+      oldShortcutStorageKey: 'papercache-shortcut-newnote',
     },
     {
       key: 'shortcutTasks',
@@ -121,15 +127,12 @@ export function KeybindsModal({ onClose }: KeybindsModalProps) {
 
   const handleSave = () => {
     for (const sc of shortcuts) {
-      if (sc.section === 'global') {
-        const oldShortcutKey =
-          sc.key === 'shortcutToggle' ? 'papercache-shortcut-toggle' : 'papercache-shortcut-newnote'
-        const oldShortcut = localStorage.getItem(oldShortcutKey) || sc.defaultKey
-        const action = sc.key === 'shortcutToggle' ? 'toggle' : 'new-note'
+      if (sc.section === 'global' && sc.action && sc.oldShortcutStorageKey) {
+        const oldShortcut = localStorage.getItem(sc.oldShortcutStorageKey) || sc.defaultKey
         if (window.electronAPI.updateGlobalShortcut) {
-          window.electronAPI.updateGlobalShortcut(action, oldShortcut, values[sc.key])
+          window.electronAPI.updateGlobalShortcut(sc.action, oldShortcut, values[sc.key])
         }
-        localStorage.setItem(oldShortcutKey, values[sc.key])
+        localStorage.setItem(sc.oldShortcutStorageKey, values[sc.key])
       }
       localStorage.setItem(sc.storageKey, values[sc.key])
     }

src/components/TimersPage.tsx

@@ -41,7 +41,7 @@ function TimerItem({ timer, onRemove }: TimerItemProps) {
       }
     }
 
-    timeoutRef.current = setTimeout(tick, 250)
+    timeoutRef.current = setTimeout(tick, TICK_INTERVAL_MS)
 
     return () => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current)

src/hooks/useReminders.ts

@@ -40,14 +40,13 @@ export function useReminders() {
   const notes = useAppStore((state) => state.notes)
 
   useEffect(() => {
-    const pending = collectFutureReminders(notes)
     const token = ++scheduleToken
+    const pending = collectFutureReminders(notes)
+    if (token !== scheduleToken) return
 
     window.electronAPI
       .scheduleReminders(pending)
-      .then(() => {
-        if (token !== scheduleToken) return
-      })
+      .then(() => {})
       // eslint-disable-next-line no-console
       .catch((e) => console.error('Failed to schedule reminders', e))
   }, [notes])

src/lib/editor/extensions.ts

@@ -178,8 +178,11 @@ export function useEditorExtensions() {
                     })
 
                     let response: string
-                    if (completion.choices && completion.choices.length > 0) {
-                      response = completion.choices[0].message?.content || ''
+                    const choice = completion.choices?.[0]
+                    if (choice?.message?.content) {
+                      response = choice.message.content
+                    } else if (choice?.message?.content === '') {
+                      response = ''
                     } else if (completion.error) {
                       throw new Error(completion.error.message || 'Unknown API Error')
                     } else {

src/setupTests.ts

@@ -73,8 +73,8 @@ if (typeof window !== 'undefined') {
     safeStorageDecrypt: vi.fn((val) => Promise.resolve(val)),
     onPowerSuspend: vi.fn().mockReturnValue(() => {}),
     onPowerResume: vi.fn().mockReturnValue(() => {}),
-    pauseShortcuts: vi.fn(),
-    resumeShortcuts: vi.fn(),
+    pauseShortcuts: vi.fn().mockResolvedValue(undefined),
+    resumeShortcuts: vi.fn().mockResolvedValue(undefined),
     onUpdateReady: vi.fn().mockReturnValue(() => {}),
     scheduleReminders: vi.fn().mockResolvedValue(undefined),
     cancelReminders: vi.fn().mockResolvedValue(undefined),

src/types.d.ts

@@ -44,8 +44,8 @@ export interface ElectronAPI {
   safeStorageDecrypt: (val: string) => Promise<string>
   onPowerSuspend: (callback: () => void) => () => void
   onPowerResume: (callback: () => void) => () => void
-  pauseShortcuts: () => void
-  resumeShortcuts: () => void
+  pauseShortcuts: () => Promise<void>
+  resumeShortcuts: () => Promise<void>
   onUpdateReady: (callback: () => void) => () => void
 }