diff --git a/Cargo.lock b/Cargo.lock index d6a7f7efdd7..c1f5e49d5f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2505,31 +2505,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "emoji_selector" -version = "0.1.0" -dependencies = [ - "common", - "dioxus", - "dioxus-desktop", - "emojis", - "extensions", - "futures", - "kit", - "once_cell", - "uuid", - "warp", -] - -[[package]] -name = "emojis" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979" -dependencies = [ - "phf 0.11.2", -] - [[package]] name = "encoding_rs" version = "0.8.33" @@ -9141,7 +9116,6 @@ dependencies = [ "dioxus-router", "dirs", "either", - "extensions", "fdlimit", "filetime", "futures", diff --git a/Cargo.toml b/Cargo.toml index 51c85e267ff..c0d8cd07f40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,6 @@ members = [ "ui", "icons", "common", - "extensions", - "native_extensions/emoji_selector", ] resolver = "2" diff --git a/ui/Cargo.toml b/ui/Cargo.toml index d2516d4ead8..1237b0d4686 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -17,7 +17,7 @@ raw-window-handle = { workspace = true } dioxus-core = { workspace = true } kit = { workspace = true } common = { workspace = true } -extensions = { workspace = true } +# extensions = { workspace = true } tokio-util = { workspace = true } arboard = { workspace = true } humansize = { workspace = true } diff --git a/ui/src/layouts/chats/presentation/chatbar.rs b/ui/src/layouts/chats/presentation/chatbar.rs index cb43ce923f8..9824e1c25f5 100644 --- a/ui/src/layouts/chats/presentation/chatbar.rs +++ b/ui/src/layouts/chats/presentation/chatbar.rs @@ -419,7 +419,8 @@ pub fn get_chatbar<'a>(cx: &'a Scoped<'a, ChatProps>) -> Element<'a> { let ext_renders = extensions .values() .filter(|(is_enabled, ext)| { - ext.details().location == extensions::Location::Chatbar && *is_enabled + /*ext.details().location == extensions::Location::Chatbar && *is_enabled*/ + false }) .map(|(_, ext)| ext.render(cx.scope)) .collect::>(); diff --git a/ui/src/layouts/chats/presentation/sidebar/mod.rs b/ui/src/layouts/chats/presentation/sidebar/mod.rs index 5328a31273a..bac0c9530bf 100644 --- a/ui/src/layouts/chats/presentation/sidebar/mod.rs +++ b/ui/src/layouts/chats/presentation/sidebar/mod.rs @@ -107,7 +107,7 @@ pub fn Sidebar(cx: Scope) -> Element { let extensions = &state.read().ui.extensions; let ext_renders = extensions .values() - .filter(|(_, ext)| ext.details().location == extensions::Location::Sidebar) + .filter(|(_, ext)|/*ext.details().location == extensions::Location::Sidebar*/ false) .map(|(_, ext)| rsx!(ext.render(cx.scope))) .collect::>(); let search_typed_chars = use_ref(cx, String::new); diff --git a/ui/src/main.rs b/ui/src/main.rs index 8a7dd178355..aad7b7e9b71 100644 --- a/ui/src/main.rs +++ b/ui/src/main.rs @@ -21,7 +21,7 @@ use dioxus_desktop::{ use_window, }; use dioxus_router::prelude::{use_navigator, Outlet, Routable, Router}; -use extensions::UplinkExtension; +// use extensions::UplinkExtension; use futures::channel::oneshot; use futures::StreamExt; use kit::components::context_menu::{ContextItem, ContextMenu}; @@ -566,14 +566,14 @@ fn use_app_coroutines(cx: &ScopeState) -> Option<()> { } // this is technically bad because it blocks the async runtime - match get_extensions() { + /*match get_extensions() { Ok(ext) => { state.write().mutate(Action::RegisterExtensions(ext)); } Err(e) => { log::error!("failed to get extensions: {e}"); } - } + }*/ log::debug!( "Loaded {} extensions.", state.read().ui.extensions.values().count() @@ -679,14 +679,14 @@ fn use_app_coroutines(cx: &ScopeState) -> Option<()> { }; log::debug!("{event:?}"); - match get_extensions() { + /*match get_extensions() { Ok(ext) => { state.write().mutate(Action::RegisterExtensions(ext)); } Err(e) => { log::error!("failed to get extensions: {e}"); } - } + }*/ } } }); @@ -964,7 +964,7 @@ fn use_router_notification_listener(cx: &ScopeState) -> Option<()> { Some(()) } -fn get_extensions() -> Result, Box> { +/*fn get_extensions() -> Result, Box> { fs::create_dir_all(&STATIC_ARGS.extensions_path)?; let mut extensions = HashMap::new(); @@ -1003,7 +1003,7 @@ fn get_extensions() -> Result, Box,