diff --git a/Cargo.lock b/Cargo.lock index 801dc66a..7a6af6a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05" dependencies = [ "anyhow", "async-trait", @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "collab-define" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05" dependencies = [ "anyhow", "collab", @@ -886,7 +886,7 @@ dependencies = [ [[package]] name = "collab-plugins" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05" dependencies = [ "anyhow", "async-trait", @@ -913,7 +913,7 @@ dependencies = [ [[package]] name = "collab-sync-protocol" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=3f235e#3f235e3e21fa520fde50d512f3b6ad54283fa732" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=48bbe9#48bbe939903d82027060f9439b25e3a6e88feb05" dependencies = [ "bytes", "collab", diff --git a/Cargo.toml b/Cargo.toml index 0e309108..30868331 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,10 +121,10 @@ lto = false opt-level = 3 [patch.crates-io] -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } -collab-sync-protocol = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } -collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } -collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "3f235e" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" } +collab-sync-protocol = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" } +collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" } +collab-define = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "48bbe9" } # Comment the above and uncomment the below to use local version of collab by cloning the repo and placing it in libs folder #collab = { path = "libs/AppFlowy-Collab/collab" } diff --git a/libs/realtime/src/collaborate/broadcast.rs b/libs/realtime/src/collaborate/broadcast.rs index daa89c38..f304373b 100644 --- a/libs/realtime/src/collaborate/broadcast.rs +++ b/libs/realtime/src/collaborate/broadcast.rs @@ -177,7 +177,7 @@ impl CollabBroadcast { } tracing::debug!("[💭Server]: {}", collab_msg,); let payload = collab_msg.payload().unwrap(); - let mut decoder = DecoderV1::from(payload.as_ref()); + let mut decoder = DecoderV1::from(payload); let mut sink = sink.lock().await; let reader = MessageReader::new(&mut decoder); for msg in reader { diff --git a/tests/realtime/test_client.rs b/tests/realtime/test_client.rs index beba510f..b5c8451e 100644 --- a/tests/realtime/test_client.rs +++ b/tests/realtime/test_client.rs @@ -71,7 +71,7 @@ impl TestClient { let origin = CollabOrigin::Client(CollabClient::new(uid, device_id.clone())); let collab = Arc::new(MutexCollab::new(origin.clone(), object_id, vec![])); - let object = SyncObject::new(object_id, &workspace_id, collab_type); + let object = SyncObject::new(object_id, &workspace_id, collab_type, &device_id); let sync_plugin = SyncPlugin::new( origin.clone(), object,