diff --git a/services/appflowy-collaborate/src/group/cmd.rs b/services/appflowy-collaborate/src/group/cmd.rs index 01bac512..3c1b9c88 100644 --- a/services/appflowy-collaborate/src/group/cmd.rs +++ b/services/appflowy-collaborate/src/group/cmd.rs @@ -7,13 +7,9 @@ use bytes::Bytes; use collab::core::origin::{CollabClient, CollabOrigin}; use collab::entity::EncodedCollab; use dashmap::DashMap; -use futures::Sink; use futures_util::StreamExt; use std::collections::HashMap; -use std::marker::PhantomData; -use std::pin::Pin; use std::sync::Arc; -use std::task::{Context, Poll}; use collab_entity::CollabType; use collab_rt_entity::user::RealtimeUser; diff --git a/services/appflowy-collaborate/src/group/group_init.rs b/services/appflowy-collaborate/src/group/group_init.rs index ee4bc285..071a32e7 100644 --- a/services/appflowy-collaborate/src/group/group_init.rs +++ b/services/appflowy-collaborate/src/group/group_init.rs @@ -339,7 +339,7 @@ impl CollabGroup { { // first check if we need to send any updates let collab_sv = self.state.state_vector.read().await; - if &*collab_sv <= &state_vector { + if *collab_sv <= state_vector { return Ok(vec![]); } } @@ -372,7 +372,7 @@ impl CollabGroup { self.state.subscribers.contains_key(user) } - pub async fn remove_user(&self, user: &RealtimeUser) { + pub fn remove_user(&self, user: &RealtimeUser) { if self.state.subscribers.remove(user).is_some() { trace!( "{} remove subscriber from group: {}", diff --git a/services/appflowy-collaborate/src/rt_server.rs b/services/appflowy-collaborate/src/rt_server.rs index 1f998d08..99b4bc1e 100644 --- a/services/appflowy-collaborate/src/rt_server.rs +++ b/services/appflowy-collaborate/src/rt_server.rs @@ -1,9 +1,6 @@ use std::sync::{Arc, Weak}; use std::time::Duration; -use redis::aio::ConnectionManager; -use tokio::sync::Notify; - use access_control::collab::RealtimeAccessControl; use anyhow::{anyhow, Result}; use app_error::AppError; @@ -13,6 +10,7 @@ use collab_stream::client::CollabRedisStream; use collab_stream::stream_router::StreamRouter; use dashmap::mapref::entry::Entry; use dashmap::DashMap; +use redis::aio::ConnectionManager; use tokio::sync::mpsc::Sender; use tokio::task::yield_now; use tokio::time::interval;