fix: unregister ext hotkey when it gets deleted (#770)

SteveLauC · web-flow · commit 7d0e7cd7dc13 · 2025-07-18T13:20:41.000+08:00
This commit fixes the bug that when an extension gets uninstalled, its
registered hotkey won't be cleared.
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -23,6 +23,7 @@ Information about release notes of Coco Server is provided here.
 - fix(file search): apply filters before from/size parameters #741
 - fix(file search): searching by name&content does not search file name #743
 - fix: prevent window from hiding when moved on Windows #748
+- fix: unregister ext hotkey when it gets deleted #770
 
 ### ✈️ Improvements
 
diff --git a/src-tauri/src/extension/third_party/mod.rs b/src-tauri/src/extension/third_party/mod.rs
@@ -4,7 +4,6 @@ use super::alter_extension_json_file;
 use super::canonicalize_relative_icon_path;
 use super::Extension;
 use super::ExtensionType;
-use crate::util::platform::Platform;
 use super::LOCAL_QUERY_SOURCE_TYPE;
 use super::PLUGIN_JSON_FILE_NAME;
 use crate::common::document::open;
@@ -16,6 +15,7 @@ use crate::common::search::QuerySource;
 use crate::common::search::SearchQuery;
 use crate::common::traits::SearchSource;
 use crate::extension::ExtensionBundleIdBorrowed;
+use crate::util::platform::Platform;
 use crate::GLOBAL_TAURI_APP_HANDLE;
 use async_trait::async_trait;
 use borrowme::ToOwned;
@@ -48,7 +48,6 @@ pub(crate) static THIRD_PARTY_EXTENSIONS_DIRECTORY: LazyLock<PathBuf> = LazyLock
     app_data_dir
 });
 
-
 pub(crate) async fn list_third_party_extensions(
     directory: &Path,
 ) -> Result<(bool, Vec<Extension>), String> {
@@ -810,7 +809,7 @@ impl ThirdPartyExtensionsSearchSource {
     }
 
     /// Remove `extension` from the **in-memory** extension list.
-    pub(crate) async fn remove_extension(&self, developer: &str, extension_id: &str) {
+    pub(crate) async fn remove_extension(&self, developer: &str, extension_id: &str) -> Extension {
         let mut write_lock_guard = self.inner.extensions.write().await;
         let Some(index) = write_lock_guard
             .iter()
@@ -822,7 +821,7 @@ impl ThirdPartyExtensionsSearchSource {
             );
         };
 
-        write_lock_guard.remove(index);
+        write_lock_guard.remove(index)
     }
 }
 
@@ -1044,7 +1043,6 @@ fn calculate_text_similarity(query: &str, text: &str) -> Option<f64> {
     }
 }
 
-
 #[tauri::command]
 pub(crate) async fn uninstall_extension(
     developer: String,
@@ -1066,12 +1064,19 @@ pub(crate) async fn uninstall_extension(
         .await
         .map_err(|e| e.to_string())?;
 
-    THIRD_PARTY_EXTENSIONS_SEARCH_SOURCE
+    let extension = THIRD_PARTY_EXTENSIONS_SEARCH_SOURCE
         .get()
         .unwrap()
         .remove_extension(&developer, &extension_id)
         .await;
 
+    // Unregister the extension hotkey, if set.
+    //
+    // Unregistering hotkey is the only thing that we will do when we disable
+    // an extension, so we directly use this function here even though "disabling"
+    // the extension that one is trying to uninstall does not make too much sense.
+    ThirdPartyExtensionsSearchSource::_disable_extension(&extension).await?;
+
     Ok(())
 }
 
