Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: decline pending join requests when project is unregistered

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-16 17:46:08 +02:00
parent aa90c06012
commit 740ec3d192
2 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/collab/src/rpc.rs
View file

@ -347,6 +347,19 @@ impl Server {
self.peer self.peer
.send(conn_id, proto::UnregisterProject { project_id }) .send(conn_id, proto::UnregisterProject { project_id })
}); });
for (_, receipts) in project.join_requests {
for receipt in receipts {
self.peer.respond(
receipt,
proto::JoinProjectResponse {
variant: Some(proto::join_project_response::Variant::Decline(
proto::join_project_response::Decline {},
)),
},
)?;
}
}
} }
for project_id in removed_connection.guest_project_ids { for project_id in removed_connection.guest_project_ids {
@ -409,11 +422,24 @@ impl Server {
self: Arc<Server>, self: Arc<Server>,
request: TypedEnvelope<proto::UnregisterProject>, request: TypedEnvelope<proto::UnregisterProject>,
) -> Result<()> { ) -> Result<()> {
let user_id = { let (user_id, project) = {
let mut state = self.store_mut().await; let mut state = self.store_mut().await;
state.unregister_project(request.payload.project_id, request.sender_id)?; let project =
state.user_id_for_connection(request.sender_id)? state.unregister_project(request.payload.project_id, request.sender_id)?;
(state.user_id_for_connection(request.sender_id)?, project)
}; };
for (_, receipts) in project.join_requests {
for receipt in receipts {
self.peer.respond(
receipt,
proto::JoinProjectResponse {
variant: Some(proto::join_project_response::Variant::Decline(
proto::join_project_response::Decline {},
)),
},
)?;
}
}
self.update_user_contacts(user_id).await?; self.update_user_contacts(user_id).await?;
Ok(()) Ok(())

14
crates/collab/src/rpc/store.rs
View file

@ -338,6 +338,20 @@ impl Store {
} }
} }
for requester_user_id in project.join_requests.keys() {
if let Some(requester_connection_ids) =
self.connections_by_user_id.get_mut(&requester_user_id)
{
for requester_connection_id in requester_connection_ids.iter() {
if let Some(requester_connection) =
self.connections.get_mut(requester_connection_id)
{
requester_connection.requested_projects.remove(&project_id);
}
}
}
}
Ok(project) Ok(project)
} else { } else {
Err(anyhow!("no such project"))? Err(anyhow!("no such project"))?