diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart index a20818b105..270ef6f24a 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_workspace.dart @@ -27,6 +27,8 @@ class SidebarWorkspace extends StatelessWidget { @override Widget build(BuildContext context) { return BlocConsumer( + listenWhen: (previous, current) => + previous.actionResult != current.actionResult, listener: _showResultDialog, builder: (context, state) { final currentWorkspace = state.currentWorkspace; diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.lock b/frontend/appflowy_tauri/src-tauri/Cargo.lock index 20c009b266..86046703db 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.lock +++ b/frontend/appflowy_tauri/src-tauri/Cargo.lock @@ -156,7 +156,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -712,14 +712,13 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", - "brotli", "bytes", "chrono", "client-websocket", @@ -759,7 +758,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "futures-channel", "futures-util", @@ -833,7 +832,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -857,7 +856,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -887,7 +886,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -906,7 +905,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "bytes", @@ -921,7 +920,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "chrono", @@ -959,7 +958,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-stream", @@ -998,7 +997,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -1023,7 +1022,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -1037,7 +1036,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -1096,9 +1095,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1107,12 +1106,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1260,7 +1259,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.6", - "phf 0.8.0", + "phf 0.11.2", "smallvec", ] @@ -1371,7 +1370,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -2687,7 +2686,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "futures-util", @@ -2704,7 +2703,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -3027,17 +3026,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -3155,7 +3143,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "reqwest", @@ -5013,9 +5001,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.5", "bytes", @@ -5044,6 +5032,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -5599,7 +5588,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -5865,6 +5854,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sysinfo" version = "0.30.5" @@ -7050,9 +7045,9 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -7587,7 +7582,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/appflowy_tauri/src-tauri/Cargo.toml b/frontend/appflowy_tauri/src-tauri/Cargo.toml index 01410f3029..fd625df074 100644 --- a/frontend/appflowy_tauri/src-tauri/Cargo.toml +++ b/frontend/appflowy_tauri/src-tauri/Cargo.toml @@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f1af98f50fa18db495a948918f35dc6fa6ae92" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } # Please use the following script to update collab. # Working directory: frontend # @@ -97,10 +97,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } diff --git a/frontend/appflowy_web/wasm-libs/Cargo.lock b/frontend/appflowy_web/wasm-libs/Cargo.lock index 6258188587..d33e2eaef2 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.lock +++ b/frontend/appflowy_web/wasm-libs/Cargo.lock @@ -176,21 +176,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -215,7 +200,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -376,27 +361,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "bstr" version = "1.9.0" @@ -541,14 +505,13 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", - "brotli", "bytes", "chrono", "client-websocket", @@ -587,7 +550,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "futures-channel", "futures-util", @@ -765,7 +728,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -790,7 +753,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -851,9 +814,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -862,12 +825,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -956,7 +919,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1001,7 +964,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -1769,7 +1732,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "futures-util", @@ -1786,7 +1749,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -2022,17 +1985,6 @@ dependencies = [ "cc", ] -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -2116,7 +2068,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "reqwest", @@ -2412,12 +2364,6 @@ dependencies = [ "tendril", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "md5" version = "0.7.0" @@ -2569,16 +2515,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -2836,7 +2772,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros 0.8.0", + "phf_macros", "phf_shared 0.8.0", "proc-macro-hack", ] @@ -2856,7 +2792,6 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -2924,19 +2859,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "phf_shared" version = "0.8.0" @@ -3417,9 +3339,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -3448,6 +3370,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -3816,7 +3739,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -4009,6 +3932,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -4190,7 +4119,6 @@ dependencies = [ "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", @@ -4738,9 +4666,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", diff --git a/frontend/appflowy_web/wasm-libs/Cargo.toml b/frontend/appflowy_web/wasm-libs/Cargo.toml index cea59bda69..250c7169f3 100644 --- a/frontend/appflowy_web/wasm-libs/Cargo.toml +++ b/frontend/appflowy_web/wasm-libs/Cargo.toml @@ -55,7 +55,7 @@ codegen-units = 1 # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f1af98f50fa18db495a948918f35dc6fa6ae92" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } # Please use the following script to update collab. # Working directory: frontend # @@ -65,10 +65,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.lock b/frontend/appflowy_web_app/src-tauri/Cargo.lock index 6d2b1b3582..e8b3493652 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.lock +++ b/frontend/appflowy_web_app/src-tauri/Cargo.lock @@ -147,7 +147,7 @@ checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -687,14 +687,13 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", - "brotli", "bytes", "chrono", "client-websocket", @@ -734,7 +733,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "futures-channel", "futures-util", @@ -817,7 +816,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -841,7 +840,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -871,7 +870,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -890,7 +889,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "bytes", @@ -905,7 +904,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "chrono", @@ -943,7 +942,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-stream", @@ -982,7 +981,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -1007,7 +1006,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -1021,7 +1020,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -1248,7 +1247,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa 1.0.10", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1359,7 +1358,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -2757,7 +2756,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "futures-util", @@ -2774,7 +2773,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -3221,7 +3220,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "reqwest", @@ -5678,7 +5677,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -7880,7 +7879,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/appflowy_web_app/src-tauri/Cargo.toml b/frontend/appflowy_web_app/src-tauri/Cargo.toml index 01410f3029..fd625df074 100644 --- a/frontend/appflowy_web_app/src-tauri/Cargo.toml +++ b/frontend/appflowy_web_app/src-tauri/Cargo.toml @@ -87,7 +87,7 @@ yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d # Run the script: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f1af98f50fa18db495a948918f35dc6fa6ae92" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } # Please use the following script to update collab. # Working directory: frontend # @@ -97,10 +97,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index f2d0c88260..65f4df6908 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -157,7 +157,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "app-error" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -669,14 +669,13 @@ dependencies = [ [[package]] name = "client-api" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "again", "anyhow", "app-error", "async-trait", "bincode", - "brotli", "bytes", "chrono", "client-websocket", @@ -716,7 +715,7 @@ dependencies = [ [[package]] name = "client-websocket" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "futures-channel", "futures-util", @@ -759,7 +758,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -783,7 +782,7 @@ dependencies = [ [[package]] name = "collab-database" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-trait", @@ -813,7 +812,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -832,7 +831,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "bytes", @@ -847,7 +846,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "chrono", @@ -885,7 +884,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "async-stream", @@ -924,7 +923,7 @@ dependencies = [ [[package]] name = "collab-rt-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -949,7 +948,7 @@ dependencies = [ [[package]] name = "collab-rt-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "bincode", @@ -963,7 +962,7 @@ dependencies = [ [[package]] name = "collab-user" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=5f66f8c921646d7d8762cafc8bbec72d56c2e157#5f66f8c921646d7d8762cafc8bbec72d56c2e157" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=352c55199449fbe321965fd42d2ff09ff54cf3f1#352c55199449fbe321965fd42d2ff09ff54cf3f1" dependencies = [ "anyhow", "collab", @@ -1037,9 +1036,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1048,12 +1047,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1160,7 +1159,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf 0.8.0", "smallvec", ] @@ -1293,7 +1292,7 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "database-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -2482,7 +2481,7 @@ dependencies = [ [[package]] name = "gotrue" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "futures-util", @@ -2499,7 +2498,7 @@ dependencies = [ [[package]] name = "gotrue-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -2784,17 +2783,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -2889,7 +2877,7 @@ dependencies = [ [[package]] name = "infra" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "reqwest", @@ -3211,12 +3199,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "matchit" version = "0.7.2" @@ -3699,7 +3681,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_macros 0.8.0", + "phf_macros", "phf_shared 0.8.0", "proc-macro-hack", ] @@ -3719,7 +3701,6 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -3787,19 +3768,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.47", -] - [[package]] name = "phf_shared" version = "0.8.0" @@ -4470,9 +4438,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.5", "bytes", @@ -4502,6 +4470,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -4967,7 +4936,7 @@ dependencies = [ [[package]] name = "shared-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "app-error", @@ -6137,9 +6106,9 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6405,7 +6374,7 @@ dependencies = [ [[package]] name = "workspace-template" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=01f1af98f50fa18db495a948918f35dc6fa6ae92#01f1af98f50fa18db495a948918f35dc6fa6ae92" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Cloud?rev=bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9#bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" dependencies = [ "anyhow", "async-trait", diff --git a/frontend/rust-lib/Cargo.toml b/frontend/rust-lib/Cargo.toml index ec34a3a6a6..984573d5ed 100644 --- a/frontend/rust-lib/Cargo.toml +++ b/frontend/rust-lib/Cargo.toml @@ -111,7 +111,7 @@ rocksdb = { git = "https://github.com/LucasXu0/rust-rocksdb", rev = "21cf4a23ec1 # Run the script.add_workspace_members: # scripts/tool/update_client_api_rev.sh new_rev_id # ⚠️⚠️⚠️️ -client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f1af98f50fa18db495a948918f35dc6fa6ae92" } +client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "bdee9fa8dc0a9c3f45caec3a1ef2a496f5e7e9e9" } # Please use the following script to update collab. # Working directory: frontend # @@ -121,10 +121,10 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "01f # To switch to the local path, run: # scripts/tool/update_collab_source.sh # ⚠️⚠️⚠️️ -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "5f66f8c921646d7d8762cafc8bbec72d56c2e157" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "352c55199449fbe321965fd42d2ff09ff54cf3f1" } diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml index f1dedab5b4..83473f40ad 100644 --- a/frontend/rust-lib/dart-ffi/Cargo.toml +++ b/frontend/rust-lib/dart-ffi/Cargo.toml @@ -30,8 +30,8 @@ lib-dispatch = { workspace = true } # Core #flowy-core = { workspace = true, features = ["profiling"] } -flowy-core = { workspace = true, features = ["verbose_log"] } -#flowy-core = { workspace = true } +#flowy-core = { workspace = true, features = ["verbose_log"] } +flowy-core = { workspace = true } flowy-notification = { workspace = true, features = ["dart"] } flowy-document = { workspace = true, features = ["dart"] } diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs index a96fb5c7a6..b40654b09a 100644 --- a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs +++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs @@ -139,6 +139,7 @@ impl UserManager { .get_user_service()? .open_workspace(workspace_id) .await; + if let Some(user_workspace) = self.get_user_workspace(uid, workspace_id) { if let Err(err) = self .user_status_callback