Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: clippy
Nathan7456c65799d3
diff --git a/frontend/rust-lib/collab-integrate/src/collab_builder.rs b/frontend/rust-lib/collab-integrate/src/collab_builder.rsindex b6e89a5a2d..c94660dbfd 100644--- a/frontend/rust-lib/collab-integrate/src/collab_builder.rs+++ b/frontend/rust-lib/collab-integrate/src/collab_builder.rs@@ -284,7 +284,7 @@ impl AppFlowyCollabBuilder {object.uid,object.workspace_id.clone(),object.object_id.to_string(),- object.collab_type.clone(),+ object.collab_type,collab_db,persistence_config,);diff --git a/frontend/rust-lib/flowy-ai/src/ai_manager.rs b/frontend/rust-lib/flowy-ai/src/ai_manager.rsindex 6092839747..000955cb33 100644--- a/frontend/rust-lib/flowy-ai/src/ai_manager.rs+++ b/frontend/rust-lib/flowy-ai/src/ai_manager.rs@@ -390,7 +390,7 @@ impl AIManager {.get_server_available_models().await?.into_iter()- .map(|m| AIModel::from(m))+ .map(AIModel::from).collect();trace!("[Model Selection]: Available models: {:?}", models);@@ -428,7 +428,7 @@ impl AIManager {None => {// when there is selected model and current local ai is active, then use local aiif let Some(local_ai_model) = models.iter().find(|m| m.is_local) {- user_selected_model = AIModel::from(local_ai_model.clone());+ user_selected_model = local_ai_model.clone();}},Some(model) => {@@ -442,14 +442,14 @@ impl AIManager {.iter().find(|m| m.name == user_selected_model.name).cloned()- .or_else(|| Some(AIModel::from(server_active_model)));+ .or(Some(server_active_model));// Update the stored preference if a different model is used.if let Some(ref active_model) = active_model {if active_model.name != user_selected_model.name {self.store_preferences- .set_object::<AIModel>(&source_key, &AIModel::from(active_model.clone()))?;+ .set_object::<AIModel>(&source_key, &active_model.clone())?;}}diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rsindex a8827e06b0..c3d0358fcb 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs@@ -24,7 +24,7 @@ impl SnapshotPersistence for SnapshotDBImpl {collab_type: &CollabType,encoded_v1: Vec<u8>,) -> Result<(), PersistenceError> {- let collab_type = collab_type.clone();+ let collab_type = *collab_type;let object_id = object_id.to_string();let weak_user = self.0.clone();tokio::task::spawn_blocking(move || {diff --git a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rsindex 9bed61d918..ef69fe7d82 100644--- a/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs+++ b/frontend/rust-lib/flowy-core/src/deps_resolve/folder_deps/mod.rs@@ -197,7 +197,7 @@ impl FolderQueryService for FolderServiceImpl {}async fn get_collab(&self, object_id: &str, collab_type: CollabType) -> Option<QueryCollab> {- let encode_collab = get_encoded_collab_v1_from_disk(&self.user, object_id, collab_type.clone())+ let encode_collab = get_encoded_collab_v1_from_disk(&self.user, object_id, collab_type).await.ok();diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rsindex fca8db4f97..63f95011bd 100644--- a/frontend/rust-lib/flowy-database2/src/manager.rs+++ b/frontend/rust-lib/flowy-database2/src/manager.rs@@ -776,7 +776,7 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {collab_type: CollabType,encoded_collab: Option<(EncodedCollab, bool)>,) -> Result<Collab, DatabaseError> {- let object = self.build_collab_object(object_id, collab_type.clone())?;+ let object = self.build_collab_object(object_id, collab_type)?;let data_source = if self.persistence.is_collab_exist(object_id) {trace!("build collab: {}:{} from local encode collab",@@ -796,7 +796,7 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {object_id,encoded_collab.is_none(),);- match self.get_encode_collab(object_id, collab_type.clone()).await {+ match self.get_encode_collab(object_id, collab_type).await {Ok(Some(encode_collab)) => {info!("build collab: {}:{} with remote encode collab, {} bytes",@@ -885,7 +885,7 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl {.filter_map(|object_id| {self.persistence- .get_encoded_collab(object_id.as_str(), collab_type.clone())+ .get_encoded_collab(object_id.as_str(), collab_type).map(|encoded_collab| (object_id.clone(), encoded_collab))}).collect();diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rsindex 4d264365ec..51e01bf4c1 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs@@ -45,7 +45,7 @@ wherelet cloned_user = self.user.clone();let params = QueryCollabParams {workspace_id: workspace_id.clone(),- inner: QueryCollab::new(object_id.clone(), collab_type.clone()),+ inner: QueryCollab::new(object_id.clone(), collab_type),};let result = try_get_client?.get_collab(params).await;match result {@@ -102,7 +102,7 @@ wherelet client = try_get_client?;let params = object_ids.into_iter()- .map(|object_id| QueryCollab::new(object_id, object_ty.clone()))+ .map(|object_id| QueryCollab::new(object_id, object_ty)).collect();let results = client.batch_get_collab(&workspace_id, params).await?;check_request_workspace_id_is_match(&workspace_id, &cloned_user, "batch get database object")?;diff --git a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rsindex 129b605281..c2325815d6 100644--- a/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs+++ b/frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs@@ -1248,7 +1248,7 @@ pub async fn upload_collab_objects_data(objects.push(UserCollabParams {object_id: oid,encoded_collab,- collab_type: collab_type.clone(),+ collab_type,});size_counter += obj_size;}