fix(desktop): quit for real from the close button and the tray, add minimize to tray and keep a nick change across restarts

src-tauri/capabilities/desktop.json

@@ -1,13 +1,14 @@
 {
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "desktop",
-  "description": "desktop-only permissions: in-app auto-update and restart",
+  "description": "desktop-only permissions: in-app auto-update, restart and quit",
   "windows": [
     "main"
   ],
   "platforms": ["macOS", "windows", "linux"],
   "permissions": [
     "updater:default",
-    "process:allow-restart"
+    "process:allow-restart",
+    "process:allow-exit"
   ]
 }

src/hooks/useDesktopTray.ts

@@ -20,9 +20,7 @@ export function useDesktopTray(): void {
       shownKey = key;
       void showUnreadState(level, mentions);
     };
-    void createDesktopTray(
-      () => useStore.getState().globalSettings.closeToTray,
-    ).then(() => update(useStore.getState()));
+    void createDesktopTray().then(() => update(useStore.getState()));
     return useStore.subscribe(update);
   }, []);
 }

src/hooks/useMessageSending.ts

@@ -309,7 +309,7 @@ export function useMessageSending({
       const [commandName, ...args] = command.split(" ");
 
       if (commandName === "nick") {
-        ircClient.sendRaw(selectedServerId, `NICK ${args[0]}`);
+        if (args[0]) useStore.getState().changeNick(selectedServerId, args[0]);
       } else if (commandName === "join") {
         const [channels, keyList] = args.filter(Boolean);
         if (channels) {

src/lib/desktopTray.ts

@@ -4,6 +4,7 @@ import { Image } from "@tauri-apps/api/image";
 import { Menu } from "@tauri-apps/api/menu";
 import { TrayIcon } from "@tauri-apps/api/tray";
 import { getCurrentWindow } from "@tauri-apps/api/window";
+import { exit } from "@tauri-apps/plugin-process";
 import type { Server } from "../types";
 
 export type UnreadLevel = "none" | "unread" | "mention";
@@ -68,27 +69,29 @@ let trayCreation: Promise<void> | null = null;
 let baseIcon: Image | null = null;
 const dottedIcons = new Map<UnreadLevel, Image>();
 
-/** Creates the tray icon with its menu once per app, and hides the window on
- *  close while `shouldCloseToTray` says so. */
-export function createDesktopTray(
-  shouldCloseToTray: () => boolean,
-): Promise<void> {
-  trayCreation ??= buildTray(shouldCloseToTray);
+// We end the whole process, since any other window left open keeps the app running.
+const quitApp = () => void exit(0);
+
+/** Creates the tray icon with its menu once per app. Closing the window quits
+ *  the app, and the tray menu hides it to the tray instead. */
+export function createDesktopTray(): Promise<void> {
+  trayCreation ??= buildTray();
   return trayCreation;
 }
 
-async function buildTray(shouldCloseToTray: () => boolean): Promise<void> {
+async function buildTray(): Promise<void> {
   // The tray outlives a page reload but its menu callbacks do not, so we replace it.
   await (await TrayIcon.getById(TRAY_ID))?.close();
   baseIcon = await defaultWindowIcon();
   const menu = await Menu.new({
     items: [
       { id: "show", text: t`Show Obby`, action: () => void showMainWindow() },
       {
-        id: "quit",
-        text: t`Quit Obby`,
-        action: () => void getCurrentWindow().destroy(),
+        id: "hide",
+        text: t`Minimize to tray`,
+        action: () => void getCurrentWindow().hide(),
       },
+      { id: "quit", text: t`Quit Obby`, action: quitApp },
     ],
   });
   tray = await TrayIcon.new({
@@ -106,11 +109,7 @@ async function buildTray(shouldCloseToTray: () => boolean): Promise<void> {
         void showMainWindow();
     },
   });
-  await getCurrentWindow().onCloseRequested((event) => {
-    if (!shouldCloseToTray()) return;
-    event.preventDefault();
-    void getCurrentWindow().hide();
-  });
+  await getCurrentWindow().onCloseRequested(quitApp);
 }
 
 async function iconFor(level: UnreadLevel): Promise<Image | null> {

src/lib/settings/definitions/allSettings.ts

@@ -6,11 +6,7 @@ import { CustomMentionsField } from "../../../components/ui/settings/CustomMenti
 import { HistoryUsageField } from "../../../components/ui/settings/HistoryUsageField";
 import { IgnoreListField } from "../../../components/ui/settings/IgnoreListField";
 import { PushMethodField } from "../../../components/ui/settings/PushMethodField";
-import {
-  isTauriAndroid,
-  isTauriDesktop,
-  isTauriIOS,
-} from "../../platformUtils";
+import { isTauriAndroid, isTauriIOS } from "../../platformUtils";
 import settingsRegistry from "../registry";
 import type { SettingDefinition } from "../types";
 
@@ -188,19 +184,6 @@ const notificationSettings: SettingDefinition[] = [
     searchKeywords: ["notification", "alert", "desktop", "push", "banner"],
     priority: 0,
   },
-  {
-    id: "notifications.closeToTray",
-    key: "closeToTray",
-    category: "notifications",
-    subcategory: "Alerts",
-    title: msg`Keep Running in the Tray`,
-    description: msg`Closing the window keeps Obby connected in the system tray, so notifications still arrive`,
-    type: "toggle",
-    defaultValue: true,
-    hidden: !isTauriDesktop(),
-    searchKeywords: ["tray", "background", "close", "minimize", "menu bar"],
-    priority: 0,
-  },
   {
     id: "notifications.pushMethod",
     key: "pushMethod",