fix: Improve hotkey system and shorten feedback messages

moinulmoin · moinulmoin · commit bc5ee356fe39 · 2025-09-20T20:39:52.000+06:00
- Remove dead code for shifted character normalization (28 lines)
- Shorten all pill window feedback messages to 3-4 words max
- Add comprehensive system hotkey conflict detection
- Warn users about OS-reserved key combinations
- Add device name to license API calls
- Clean up backend key normalizer for better maintainability
diff --git a/src-tauri/src/commands/audio.rs b/src-tauri/src/commands/audio.rs
@@ -268,7 +268,7 @@ pub async fn start_recording(
 
                     // Emit user-friendly error
                     let _ = emit_to_window(&app, "pill", "recording-error",
-                        "Could not access microphone. Please check your audio settings and permissions.");
+                        "Microphone access failed");
 
                     return Err("Failed to start recording".to_string());
                 } else {
@@ -295,13 +295,13 @@ pub async fn start_recording(
 
                 // Provide specific error messages for common issues
                 let user_message = if e.contains("permission") || e.contains("access") {
-                    "Microphone access denied. Please grant permission in System Preferences."
+                    "Microphone permission denied"
                 } else if e.contains("device") || e.contains("not found") {
-                    "No microphone found. Please connect a microphone and try again."
+                    "No microphone found"
                 } else if e.contains("in use") || e.contains("busy") {
-                    "Microphone is being used by another application. Please close other recording apps."
+                    "Microphone busy"
                 } else {
-                    "Could not start recording. Please check your audio settings."
+                    "Recording failed"
                 };
 
                 let _ = emit_to_window(&app, "pill", "recording-error", user_message);
@@ -990,7 +990,7 @@ pub async fn stop_recording(
                                     &app_for_process,
                                     "pill",
                                     "paste-error",
-                                    "Text copied to clipboard. Grant accessibility permission to auto-paste."
+                                    "Text copied - grant permission to auto-paste"
                                 );
 
                                 // Keep pill visible for 3 seconds with error
@@ -1006,7 +1006,7 @@ pub async fn stop_recording(
                                     &app_for_process,
                                     "main",
                                     "paste-error",
-                                    format!("Failed to paste text: {}. Text is in clipboard.", e),
+                                    format!("Paste failed - text in clipboard"),
                                 );
                             }
                         }
diff --git a/src-tauri/src/commands/key_normalizer.rs b/src-tauri/src/commands/key_normalizer.rs
@@ -28,36 +28,9 @@ fn normalize_single_key(key: &str) -> String {
         _ => {}
     }
 
-    // Handle shifted characters - convert them back to their base keys
-    // This is needed because frontend might capture shifted characters
-    // Complete mapping for US/UK keyboard shifted characters
+    // Normalize common punctuation to their Code enum names
+    // This handles cases where the frontend sends the actual character instead of the Code name
     match key {
-        // Shifted punctuation
-        "<" => return "Comma".to_string(),
-        ">" => return "Period".to_string(),
-        "?" => return "Slash".to_string(),
-        ":" => return "Semicolon".to_string(),
-        "\"" => return "Quote".to_string(),
-        "{" => return "BracketLeft".to_string(),
-        "}" => return "BracketRight".to_string(),
-        "|" => return "Backslash".to_string(),
-        "+" => return "Equal".to_string(),
-        "_" => return "Minus".to_string(),
-        "~" => return "Backquote".to_string(),
-
-        // Shifted numbers (top row)
-        "!" => return "Digit1".to_string(),
-        "@" => return "Digit2".to_string(),
-        "#" => return "Digit3".to_string(),
-        "$" => return "Digit4".to_string(),
-        "%" => return "Digit5".to_string(),
-        "^" => return "Digit6".to_string(),
-        "&" => return "Digit7".to_string(),
-        "*" => return "Digit8".to_string(),
-        "(" => return "Digit9".to_string(),
-        ")" => return "Digit0".to_string(),
-
-        // Common punctuation (unshifted) - normalize these too
         "," => return "Comma".to_string(),
         "." => return "Period".to_string(),
         "/" => return "Slash".to_string(),
@@ -69,7 +42,6 @@ fn normalize_single_key(key: &str) -> String {
         "=" => return "Equal".to_string(),
         "-" => return "Minus".to_string(),
         "`" => return "Backquote".to_string(),
-
         _ => {}
     }
 
diff --git a/src-tauri/src/license/api_client.rs b/src-tauri/src/license/api_client.rs
@@ -168,6 +168,11 @@ impl LicenseApiClient {
             body["osVersion"] = json!(os_version);
         }
 
+        // Add device name (hostname)
+        if let Some(device_name) = System::host_name() {
+            body["deviceName"] = json!(device_name);
+        }
+
         let response = self
             .client
             .post(&url)
diff --git a/src-tauri/src/whisper/transcriber.rs b/src-tauri/src/whisper/transcriber.rs
@@ -461,7 +461,7 @@ impl Transcriber {
 
         // Check minimum duration (0.5 seconds)
         if duration_seconds < 0.5 {
-            let error = format!("Recording too short ({:.1}s). Minimum duration is 0.5 seconds", duration_seconds);
+            let error = format!("Recording too short");
             log::warn!("[TRANSCRIPTION_DEBUG] {}", error);
             return Err(error);
         }
diff --git a/src/components/HotkeyInput.tsx b/src/components/HotkeyInput.tsx
@@ -11,6 +11,7 @@ import {
   ValidationPresets
 } from "@/lib/keyboard-normalizer";
 import { mapCodeToKey } from "@/lib/keyboard-mapper";
+import { checkForSystemConflict, formatConflictMessage } from "@/lib/hotkey-conflicts";
 
 interface HotkeyInputProps {
   value: string;
@@ -147,8 +148,20 @@ export const HotkeyInput = React.memo(function HotkeyInput({
           setValidationError(validation.error || "Invalid key combination");
           setPendingHotkey("");
         } else {
-          setPendingHotkey(shortcut);
-          setValidationError("");
+          // Check for system conflicts
+          const conflict = checkForSystemConflict(shortcut);
+          if (conflict) {
+            setValidationError(formatConflictMessage(conflict));
+            // Still show the hotkey but with warning for 'warning' severity
+            if (conflict.severity === 'warning') {
+              setPendingHotkey(shortcut);
+            } else {
+              setPendingHotkey("");
+            }
+          } else {
+            setPendingHotkey(shortcut);
+            setValidationError("");
+          }
         }
       }
     };
@@ -178,9 +191,22 @@ export const HotkeyInput = React.memo(function HotkeyInput({
 
         const validation = validateKeyCombinationWithRules(shortcut, validationRules);
         if (validation.valid) {
-          setPendingHotkey(shortcut);
-          setKeys(new Set());
-          setCurrentKeysDisplay("");
+          // Check for system conflicts
+          const conflict = checkForSystemConflict(shortcut);
+          if (conflict) {
+            setValidationError(formatConflictMessage(conflict));
+            // Still allow setting it, but with warning
+            if (conflict.severity === 'warning') {
+              setPendingHotkey(shortcut);
+              setKeys(new Set());
+              setCurrentKeysDisplay("");
+            }
+          } else {
+            setPendingHotkey(shortcut);
+            setKeys(new Set());
+            setCurrentKeysDisplay("");
+            setValidationError("");
+          }
         } else {
           setValidationError(validation.error || "Invalid key combination");
         }
diff --git a/src/components/RecordingPill.tsx b/src/components/RecordingPill.tsx
@@ -109,7 +109,7 @@ export function RecordingPill() {
     unlisteners.push(
       listen("recording-stopped-silence", () => {
         console.log("RecordingPill: Received recording-stopped-silence event");
-        setFeedbackWithTimeout("Recording stopped - no sound detected", 2000);
+        setFeedbackWithTimeout("No sound detected", 2000);
       })
     );
 
diff --git a/src/contexts/LicenseContext.tsx b/src/contexts/LicenseContext.tsx
@@ -79,7 +79,7 @@ export function LicenseProvider({ children }: { children: ReactNode }) {
       await invoke('deactivate_license');
       // Re-check status after deactivation
       await checkStatus();
-      toast.success('License deactivated. You can now use it on another device.');
+      toast.success('License deactivated successfully');
     } catch (error: any) {
       console.error('Failed to deactivate license:', error);
       toast.error(error || 'Failed to deactivate license');
diff --git a/src/lib/hotkey-conflicts.ts b/src/lib/hotkey-conflicts.ts
@@ -0,0 +1,152 @@
+/**
+ * Known system hotkey conflicts for different platforms
+ * These hotkeys are reserved by the OS and may not work reliably
+ */
+
+interface ConflictInfo {
+  hotkey: string;
+  description: string;
+  severity: 'error' | 'warning';
+}
+
+const WINDOWS_CONFLICTS: ConflictInfo[] = [
+  // Windows system hotkeys
+  { hotkey: 'Ctrl+Shift+Period', description: 'May conflict with Windows IME or Office shortcuts', severity: 'warning' },
+  { hotkey: 'CommandOrControl+Shift+Period', description: 'May conflict with Windows IME or Office shortcuts', severity: 'warning' },
+  { hotkey: 'Win+Period', description: 'Windows Emoji Picker', severity: 'error' },
+  { hotkey: 'Win+Semicolon', description: 'Windows Emoji Picker', severity: 'error' },
+  { hotkey: 'Win+Space', description: 'Windows Language/Keyboard switcher', severity: 'error' },
+  { hotkey: 'Win+Tab', description: 'Windows Task View', severity: 'error' },
+  { hotkey: 'Alt+Tab', description: 'Windows App Switcher', severity: 'error' },
+  { hotkey: 'Ctrl+Alt+Delete', description: 'Windows Security Options', severity: 'error' },
+  { hotkey: 'Win+L', description: 'Windows Lock Screen', severity: 'error' },
+  { hotkey: 'Win+D', description: 'Windows Show Desktop', severity: 'error' },
+  { hotkey: 'Alt+F4', description: 'Windows Close Application', severity: 'warning' },
+  { hotkey: 'Ctrl+Shift+Escape', description: 'Windows Task Manager', severity: 'error' },
+];
+
+const MACOS_CONFLICTS: ConflictInfo[] = [
+  // macOS system hotkeys
+  { hotkey: 'CommandOrControl+Space', description: 'macOS Spotlight Search', severity: 'error' },
+  { hotkey: 'CommandOrControl+Tab', description: 'macOS App Switcher', severity: 'error' },
+  { hotkey: 'CommandOrControl+Shift+3', description: 'macOS Screenshot', severity: 'warning' },
+  { hotkey: 'CommandOrControl+Shift+4', description: 'macOS Screenshot Selection', severity: 'warning' },
+  { hotkey: 'CommandOrControl+Shift+5', description: 'macOS Screenshot/Recording', severity: 'warning' },
+  { hotkey: 'CommandOrControl+Option+Escape', description: 'macOS Force Quit', severity: 'error' },
+  { hotkey: 'CommandOrControl+Q', description: 'macOS Quit Application', severity: 'warning' },
+  { hotkey: 'CommandOrControl+W', description: 'macOS Close Window', severity: 'warning' },
+  { hotkey: 'CommandOrControl+M', description: 'macOS Minimize Window', severity: 'warning' },
+  { hotkey: 'CommandOrControl+H', description: 'macOS Hide Application', severity: 'warning' },
+  { hotkey: 'Control+CommandOrControl+Q', description: 'macOS Lock Screen', severity: 'error' },
+  { hotkey: 'Control+CommandOrControl+Space', description: 'macOS Emoji Picker', severity: 'warning' },
+];
+
+const LINUX_CONFLICTS: ConflictInfo[] = [
+  // Common Linux desktop environment hotkeys
+  { hotkey: 'Alt+Tab', description: 'Linux App Switcher', severity: 'error' },
+  { hotkey: 'Alt+F4', description: 'Linux Close Window', severity: 'warning' },
+  { hotkey: 'Super+Space', description: 'Linux Application Launcher (varies by DE)', severity: 'warning' },
+  { hotkey: 'Super+L', description: 'Linux Lock Screen (varies by DE)', severity: 'warning' },
+  { hotkey: 'Ctrl+Alt+T', description: 'Linux Terminal (varies by DE)', severity: 'warning' },
+  { hotkey: 'Ctrl+Alt+Delete', description: 'Linux System Monitor/Logout', severity: 'error' },
+  { hotkey: 'Ctrl+Alt+F1', description: 'Linux TTY1', severity: 'error' },
+  { hotkey: 'Ctrl+Alt+F2', description: 'Linux TTY2', severity: 'error' },
+];
+
+/**
+ * Check if a hotkey conflicts with known system shortcuts
+ * @param hotkey The normalized hotkey string to check
+ * @param platform Optional platform override (defaults to current platform)
+ * @returns Conflict information if found, null otherwise
+ */
+export function checkForSystemConflict(
+  hotkey: string,
+  platform?: 'windows' | 'macos' | 'linux'
+): ConflictInfo | null {
+  // Determine platform if not provided
+  if (!platform) {
+    if (typeof window !== 'undefined' && window.navigator) {
+      const userAgent = window.navigator.userAgent.toLowerCase();
+      if (userAgent.includes('win')) {
+        platform = 'windows';
+      } else if (userAgent.includes('mac')) {
+        platform = 'macos';
+      } else {
+        platform = 'linux';
+      }
+    } else {
+      // Default to windows if we can't detect
+      platform = 'windows';
+    }
+  }
+
+  // Get the appropriate conflict list
+  let conflicts: ConflictInfo[];
+  switch (platform) {
+    case 'macos':
+      conflicts = MACOS_CONFLICTS;
+      break;
+    case 'linux':
+      conflicts = LINUX_CONFLICTS;
+      break;
+    case 'windows':
+    default:
+      conflicts = WINDOWS_CONFLICTS;
+      break;
+  }
+
+  // Check for exact match (case-insensitive)
+  const normalizedHotkey = hotkey.toLowerCase();
+  const conflict = conflicts.find(c =>
+    c.hotkey.toLowerCase() === normalizedHotkey
+  );
+
+  return conflict || null;
+}
+
+/**
+ * Get all known conflicts for the current platform
+ * @param platform Optional platform override
+ * @returns Array of all known conflicts
+ */
+export function getAllConflicts(
+  platform?: 'windows' | 'macos' | 'linux'
+): ConflictInfo[] {
+  if (!platform) {
+    if (typeof window !== 'undefined' && window.navigator) {
+      const userAgent = window.navigator.userAgent.toLowerCase();
+      if (userAgent.includes('win')) {
+        platform = 'windows';
+      } else if (userAgent.includes('mac')) {
+        platform = 'macos';
+      } else {
+        platform = 'linux';
+      }
+    } else {
+      platform = 'windows';
+    }
+  }
+
+  switch (platform) {
+    case 'macos':
+      return MACOS_CONFLICTS;
+    case 'linux':
+      return LINUX_CONFLICTS;
+    case 'windows':
+    default:
+      return WINDOWS_CONFLICTS;
+  }
+}
+
+/**
+ * Format a conflict warning message
+ * @param conflict The conflict information
+ * @returns Formatted warning message
+ */
+export function formatConflictMessage(conflict: ConflictInfo): string {
+  if (conflict.severity === 'error') {
+    return `⚠️ This hotkey is reserved by the system: ${conflict.description}`;
+  } else {
+    return `ℹ️ This hotkey may conflict: ${conflict.description}`;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ impl Transcriber {`
`461`	`461`
`462`	`462`	`// Check minimum duration (0.5 seconds)`
`463`	`463`	`if duration_seconds < 0.5 {`
`464`		`- let error = format!("Recording too short ({:.1}s). Minimum duration is 0.5 seconds", duration_seconds);`
	`464`	`+ let error = format!("Recording too short");`
`465`	`465`	`log::warn!("[TRANSCRIPTION_DEBUG] {}", error);`
`466`	`466`	`return Err(error);`
`467`	`467`	`}`