From 320d62f46c86ea6f71113d2e65953f21e11475e6 Mon Sep 17 00:00:00 2001 From: Bartosz Sypytkowski Date: Mon, 5 Aug 2024 05:52:18 +0200 Subject: [PATCH] chore: change awareness emit to trigger on update instead of on change --- libs/client-api-test/src/test_client.rs | 22 +++++-------------- .../src/group/broadcast.rs | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/libs/client-api-test/src/test_client.rs b/libs/client-api-test/src/test_client.rs index 4d36a80f..4f01c3ae 100644 --- a/libs/client-api-test/src/test_client.rs +++ b/libs/client-api-test/src/test_client.rs @@ -131,25 +131,15 @@ impl TestClient { } pub async fn clean_awareness_state(&self, object_id: &str) { - self - .collabs - .get(object_id) - .unwrap() - .collab - .write() - .await - .clean_awareness_state(); + let test_collab = self.collabs.get(object_id).unwrap(); + let mut lock = test_collab.collab.write().await; + lock.clean_awareness_state(); } pub async fn emit_awareness_state(&self, object_id: &str) { - self - .collabs - .get(object_id) - .unwrap() - .collab - .write() - .await - .emit_awareness_state(); + let test_collab = self.collabs.get(object_id).unwrap(); + let mut lock = test_collab.collab.write().await; + lock.emit_awareness_state(); } pub async fn user_with_new_device(registered_user: User) -> Self { diff --git a/services/appflowy-collaborate/src/group/broadcast.rs b/services/appflowy-collaborate/src/group/broadcast.rs index 314223dd..39c36cbd 100644 --- a/services/appflowy-collaborate/src/group/broadcast.rs +++ b/services/appflowy-collaborate/src/group/broadcast.rs @@ -134,7 +134,7 @@ impl CollabBroadcast { // Observer the awareness's update and broadcast it to all subscribers. let awareness_sub = collab .get_awareness() - .on_change(move |awareness, event, _origin| { + .on_update(move |awareness, event, _origin| { if let Ok(awareness_update) = awareness.update_with_clients(event.all_changes()) { let payload = Message::Awareness(awareness_update).encode_v1(); let msg = AwarenessSync::new(cloned_oid.clone(), payload, CollabOrigin::Empty);