Fix two menu issues

- check for updates
- share debug info

Author: mtsgrd

apps/desktop/src/lib/updater/updater.ts

@@ -5,6 +5,7 @@ import { type DownloadEvent, Update } from '@tauri-apps/plugin-updater';
 import { get, writable } from 'svelte/store';
 import type { PostHogWrapper } from '$lib/analytics/posthog';
 import type { Tauri } from '$lib/backend/tauri';
+import type { ShortcutService } from '$lib/shortcuts/shortcutService.svelte';
 
 export const UPDATER_SERVICE = new InjectionToken<UpdaterService>('UpdaterService');
 
@@ -59,11 +60,14 @@ export class UpdaterService {
 
 	constructor(
 		private tauri: Tauri,
-		private posthog: PostHogWrapper
+		private posthog: PostHogWrapper,
+		private shortcuts: ShortcutService
 	) {}
 
 	private async start() {
-		this.unlistenMenu = this.tauri.listen<string>('menu://global/update/clicked', () => {
+		// This shortcut registration is never unsubscribed, but that's likely
+		// fine for the time being since the `AppUpdater` can never unmount.
+		this.shortcuts.on('update', () => {
 			this.checkForUpdate(true);
 		});
 		this.checkForUpdateInterval = setInterval(
@@ -75,7 +79,6 @@ export class UpdaterService {
 
 	private async stop() {
 		this.unlistenStatus?.();
-		this.unlistenMenu?.();
 		if (this.checkForUpdateInterval !== undefined) {
 			clearInterval(this.checkForUpdateInterval);
 			this.checkForUpdateInterval = undefined;

apps/desktop/src/routes/+layout.svelte

@@ -73,7 +73,7 @@
 	import { StackService, STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { ClientState, CLIENT_STATE } from '$lib/state/clientState.svelte';
 	import { UiState, UI_STATE } from '$lib/state/uiState.svelte';
-	import { UPDATER_SERVICE } from '$lib/updater/updater';
+	import { UPDATER_SERVICE, UpdaterService } from '$lib/updater/updater';
 	import {
 		UpstreamIntegrationService,
 		UPSTREAM_INTEGRATION_SERVICE
@@ -199,6 +199,7 @@
 	provide(PROJECTS_SERVICE, projectsService);
 
 	const shortcutService = new ShortcutService(data.tauri);
+	const updaterService = new UpdaterService(data.tauri, data.posthog, shortcutService);
 	const commitService = new CommitService();
 
 	const upstreamIntegrationService = new UpstreamIntegrationService(
@@ -249,7 +250,7 @@
 	// Setters do not need to be reactive since `data` never updates
 	provide(POSTHOG_WRAPPER, data.posthog);
 	provide(USER_SERVICE, data.userService);
-	provide(UPDATER_SERVICE, data.updaterService);
+	provide(UPDATER_SERVICE, updaterService);
 	provide(GIT_CONFIG_SERVICE, data.gitConfig);
 	provide(PROMPT_SERVICE, data.promptService);
 	provide(HTTP_CLIENT, data.httpClient);

apps/desktop/src/routes/+layout.ts

@@ -12,7 +12,6 @@ import { ProjectMetrics } from '$lib/metrics/projectMetrics';
 import { PromptService } from '$lib/prompt/promptService';
 import { RemotesService } from '$lib/remotes/remotesService';
 import { TokenMemoryService } from '$lib/stores/tokenMemoryService';
-import { UpdaterService } from '$lib/updater/updater';
 import { UserService } from '$lib/user/userService';
 import { HttpClient } from '@gitbutler/shared/network/httpClient';
 import { UploadsService } from '@gitbutler/shared/uploads/uploadsService';
@@ -48,8 +47,6 @@ export const load: LayoutLoad = async () => {
 	const appSettings = await loadAppSettings();
 	initAnalyticsIfEnabled(appSettings, posthog);
 
-	const updaterService = new UpdaterService(tauri, posthog);
-
 	const gitConfig = new GitConfigService(tauri);
 	const remotesService = new RemotesService();
 	const aiPromptService = new AIPromptService();
@@ -66,7 +63,6 @@ export const load: LayoutLoad = async () => {
 		tokenMemoryService,
 		appSettings,
 		httpClient,
-		updaterService,
 		promptService,
 		userService,
 		gitConfig,

crates/gitbutler-tauri/src/menu.rs

@@ -304,7 +304,7 @@ pub fn handle_event(webview: &WebviewWindow, event: &MenuEvent) {
     }
 
     if event.id() == "help/share-debug-info" {
-        emit(webview, SHORTCUT_EVENT, "share-debug");
+        emit(webview, SHORTCUT_EVENT, "share-debug-info");
         return;
     }